From ceedd488a814ec80ce1868fdc085aa76d0048dac Mon Sep 17 00:00:00 2001 From: robertlipe Date: Mon, 29 Jul 2013 01:49:41 +0000 Subject: [PATCH] gbtypes.h was a good idea in the pre-C99 world (and clearly heavily inspired by it), but it's not needed in C++ times. Search and replace it away. --- gpsbabel/Makefile.in | 378 +++++++++++++++++++------------------- gpsbabel/alan.cc | 104 +++++------ gpsbabel/an1.cc | 4 +- gpsbabel/axim_gpb.cc | 2 +- gpsbabel/bushnell.cc | 2 +- gpsbabel/bushnell_trl.cc | 4 +- gpsbabel/copilot.cc | 2 +- gpsbabel/coto.cc | 30 +-- gpsbabel/defs.h | 9 +- gpsbabel/delbin.cc | 318 ++++++++++++++++---------------- gpsbabel/destinator.cc | 8 +- gpsbabel/dg-100.cc | 60 +++--- gpsbabel/dmtlog.cc | 16 +- gpsbabel/enigma.cc | 22 +-- gpsbabel/exif.cc | 102 +++++----- gpsbabel/g7towin.cc | 2 +- gpsbabel/garmin_fit.cc | 40 ++-- gpsbabel/garmin_fs.cc | 6 +- gpsbabel/garmin_fs.h | 8 +- gpsbabel/garmin_gpi.cc | 58 +++--- gpsbabel/garmin_tables.cc | 6 +- gpsbabel/garmin_tables.h | 4 +- gpsbabel/garmin_txt.cc | 8 +- gpsbabel/garmin_xt.cc | 42 ++--- gpsbabel/gbfile.cc | 16 +- gpsbabel/gbfile.h | 21 ++- gpsbabel/gbtypes.h | 40 ---- gpsbabel/ggv_log.cc | 18 +- gpsbabel/gnav_trl.cc | 4 +- gpsbabel/height.h | 4 +- gpsbabel/html.cc | 2 +- gpsbabel/humminbird.cc | 134 +++++++------- gpsbabel/igo8.cc | 32 ++-- gpsbabel/inifile.h | 2 +- gpsbabel/itracku.cc | 44 ++--- gpsbabel/jeeps/gpsport.h | 10 +- gpsbabel/mapsend.cc | 2 +- gpsbabel/mmo.cc | 56 +++--- gpsbabel/msroute.cc | 116 ++++++------ gpsbabel/naviguide.cc | 16 +- gpsbabel/palmdoc.cc | 16 +- gpsbabel/pdbfile.cc | 26 +-- gpsbabel/pdbfile.h | 34 ++-- gpsbabel/pocketfms_bc.cc | 20 +- gpsbabel/psp.cc | 4 +- gpsbabel/quovadis.cc | 8 +- gpsbabel/saroute.cc | 32 ++-- gpsbabel/skytraq.cc | 128 ++++++------- gpsbabel/teletype.cc | 8 +- gpsbabel/text.cc | 2 +- gpsbabel/unicsv.cc | 2 +- gpsbabel/util.cc | 4 +- gpsbabel/vitosmt.cc | 12 +- gpsbabel/vpl.cc | 10 +- gpsbabel/wbt-200.cc | 24 +-- gpsbabel/wintec_tes.cc | 12 +- 56 files changed, 1028 insertions(+), 1066 deletions(-) delete mode 100644 gpsbabel/gbtypes.h diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index b7c2143a0..03fa39fc9 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -419,39 +419,39 @@ test-release: doc gpsbabel.html changes.html make release-tarball release-winbuild release-rpm # Machine generated from here down. -alan.o: alan.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +alan.o: alan.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -an1.o: an1.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +an1.o: an1.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ an1sym.h -arcdist.o: arcdist.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +arcdist.o: arcdist.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h grtcirc.h -avltree.o: avltree.cc avltree.h defs.h config.h queue.h gbtypes.h \ +avltree.o: avltree.cc avltree.h defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -axim_gpb.o: axim_gpb.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +axim_gpb.o: axim_gpb.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -bcr.o: bcr.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +bcr.o: bcr.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ csv_util.h garmin_tables.h -bend.o: bend.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +bend.o: bend.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h grtcirc.h -brauniger_iq.o: brauniger_iq.cc defs.h config.h queue.h gbtypes.h \ +brauniger_iq.o: brauniger_iq.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h -bushnell.o: bushnell.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +bushnell.o: bushnell.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -bushnell_trl.o: bushnell_trl.cc defs.h config.h queue.h gbtypes.h \ +bushnell_trl.o: bushnell_trl.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -cet.o: cet.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +cet.o: cet.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h -cet_util.o: cet_util.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +cet_util.o: cet_util.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h cet/ansi_x3_4_1968.h cet/iso_8859_1.h \ cet/iso_8859_8.h cet/iso_8859_15.h cet/cp1252.h cet/cp1255.h \ @@ -463,29 +463,29 @@ cet_util.o: cet_util.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ cet/iso_8859_13.h cet/iso_8859_14.h cet/iso_8859_3.h cet/iso_8859_4.h \ cet/iso_8859_5.h cet/iso_8859_6.h cet/iso_8859_7.h cet/iso_8859_9.h \ cet/koi8_r.h cet/koi8_ru.h cet/koi_8.h -cetus.o: cetus.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +cetus.o: cetus.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h pdbfile.h -coastexp.o: coastexp.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +coastexp.o: coastexp.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h uuid.h -compegps.o: compegps.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +compegps.o: compegps.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -copilot.o: copilot.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +copilot.o: copilot.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h pdbfile.h grtcirc.h -coto.o: coto.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +coto.o: coto.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h pdbfile.h grtcirc.h -cst.o: cst.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +cst.o: cst.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ strptime.h -csv_util.o: csv_util.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +csv_util.o: csv_util.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h grtcirc.h strptime.h jeeps/gpsmath.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ @@ -493,61 +493,61 @@ csv_util.o: csv_util.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \ xmlgeneric.h garmin_fs.h jeeps/gps.h xcsv_tokens.gperf -delbin.o: delbin.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +delbin.o: delbin.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -delgpl.o: delgpl.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +delgpl.o: delgpl.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -destinator.o: destinator.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +destinator.o: destinator.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h strptime.h -dg-100.o: dg-100.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +dg-100.o: dg-100.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h -discard.o: discard.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +discard.o: discard.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h -dmtlog.o: dmtlog.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +dmtlog.o: dmtlog.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h xmlgeneric.h -duplicate.o: duplicate.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +duplicate.o: duplicate.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h -easygps.o: easygps.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +easygps.o: easygps.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -enigma.o: enigma.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +enigma.o: enigma.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -exif.o: exif.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +exif.o: exif.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h garmin_tables.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h strptime.h -explorist_ini.o: explorist_ini.cc defs.h config.h queue.h gbtypes.h \ +explorist_ini.o: explorist_ini.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h explorist_ini.h -fatal.o: fatal.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +fatal.o: fatal.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -filter_vecs.o: filter_vecs.cc defs.h config.h queue.h gbtypes.h \ +filter_vecs.o: filter_vecs.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h gbversion.h -formspec.o: formspec.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +formspec.o: formspec.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -g7towin.o: g7towin.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +g7towin.o: g7towin.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ @@ -555,7 +555,7 @@ g7towin.o: g7towin.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h \ jeeps/gpsmath.h strptime.h -garmin.o: garmin.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin.o: garmin.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h grtcirc.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ @@ -564,19 +564,19 @@ garmin.o: garmin.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h \ garmin_fs.h garmin_device_xml.h garmin_device_xml.o: garmin_device_xml.cc defs.h config.h queue.h \ - gbtypes.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \ + zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \ session.h src/core/datetime.h xmlgeneric.h garmin_device_xml.h -garmin_fit.o: garmin_fit.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin_fit.o: garmin_fit.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -garmin_fs.o: garmin_fs.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin_fs.o: garmin_fs.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h -garmin_gpi.o: garmin_gpi.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin_gpi.o: garmin_gpi.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ @@ -584,13 +584,13 @@ garmin_gpi.o: garmin_gpi.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h garmin_fs.h jeeps/gps.h garmin_gpi.h garmin_tables.o: garmin_tables.cc garmin_tables.h defs.h config.h queue.h \ - gbtypes.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \ + zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \ session.h src/core/datetime.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -garmin_txt.o: garmin_txt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin_txt.o: garmin_txt.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ @@ -598,23 +598,23 @@ garmin_txt.o: garmin_txt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h \ grtcirc.h jeeps/gpsmath.h strptime.h -garmin_xt.o: garmin_xt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin_xt.o: garmin_xt.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -gbfile.o: gbfile.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gbfile.o: gbfile.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -gbser.o: gbser.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gbser.o: gbser.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h gbser_private.h -gbser_posix.o: gbser_posix.cc defs.h config.h queue.h gbtypes.h \ +gbser_posix.o: gbser_posix.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h gbser_private.h gbsleep.o: gbsleep.cc config.h -gcdb.o: gcdb.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gcdb.o: gcdb.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h pdbfile.h -gdb.o: gdb.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +gdb.o: gdb.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h \ @@ -622,127 +622,127 @@ gdb.o: gdb.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h grtcirc.h \ jeeps/gpsmath.h -geo.o: geo.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +geo.o: geo.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ xmlgeneric.h -geoniche.o: geoniche.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +geoniche.o: geoniche.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h pdbfile.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h -ggv_log.o: ggv_log.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +ggv_log.o: ggv_log.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h grtcirc.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -ggv_ovl.o: ggv_ovl.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +ggv_ovl.o: ggv_ovl.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h grtcirc.h -globals.o: globals.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +globals.o: globals.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbversion.h -glogbook.o: glogbook.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +glogbook.o: glogbook.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -gnav_trl.o: gnav_trl.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gnav_trl.o: gnav_trl.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -google.o: google.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +google.o: google.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -googledir.o: googledir.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +googledir.o: googledir.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -gopal.o: gopal.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gopal.o: gopal.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h strptime.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h grtcirc.h -gpilots.o: gpilots.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gpilots.o: gpilots.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h pdbfile.h garmin_tables.h -gpspilot.o: gpspilot.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gpspilot.o: gpspilot.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h pdbfile.h -gpssim.o: gpssim.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gpssim.o: gpssim.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -gpsutil.o: gpsutil.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gpsutil.o: gpsutil.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h magellan.h -gpx.o: gpx.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +gpx.o: gpx.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ xmlgeneric.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h src/core/xmlstreamwriter.h -grtcirc.o: grtcirc.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +grtcirc.o: grtcirc.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h grtcirc.h -gtm.o: gtm.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +gtm.o: gtm.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -gtrnctr.o: gtrnctr.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gtrnctr.o: gtrnctr.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -height.o: height.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +height.o: height.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h height.h -hiketech.o: hiketech.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +hiketech.o: hiketech.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -holux.o: holux.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +holux.o: holux.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h holux.h -hsa_ndv.o: hsa_ndv.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +hsa_ndv.o: hsa_ndv.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -html.o: html.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +html.o: html.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h -humminbird.o: humminbird.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +humminbird.o: humminbird.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h avltree.h -igc.o: igc.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +igc.o: igc.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h -ignrando.o: ignrando.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +ignrando.o: ignrando.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -igo8.o: igo8.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +igo8.o: igo8.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -ik3d.o: ik3d.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +ik3d.o: ik3d.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -inifile.o: inifile.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +inifile.o: inifile.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -internal_styles.o: internal_styles.cc defs.h config.h queue.h gbtypes.h \ +internal_styles.o: internal_styles.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -interpolate.o: interpolate.cc defs.h config.h queue.h gbtypes.h \ +interpolate.o: interpolate.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h grtcirc.h -itracku.o: itracku.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +itracku.o: itracku.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h jeeps/gpsapp.o: jeeps/gpsapp.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -751,7 +751,7 @@ jeeps/gpsapp.o: jeeps/gpsapp.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbint.h jeeps/gpscom.o: jeeps/gpscom.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -760,7 +760,7 @@ jeeps/gpscom.o: jeeps/gpscom.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpsdevice.o: jeeps/gpsdevice.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -769,7 +769,7 @@ jeeps/gpsdevice.o: jeeps/gpsdevice.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpsserial.h jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -778,7 +778,7 @@ jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpsserial.h jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -789,7 +789,7 @@ jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsusbcommon.h jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/usb.h \ jeeps/gps.h jeeps/../defs.h jeeps/../config.h jeeps/../queue.h \ - jeeps/../gbtypes.h jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h \ + jeeps/../jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h \ jeeps/../inifile.h jeeps/../session.h jeeps/../src/core/datetime.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ @@ -798,7 +798,7 @@ jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/usb.h \ jeeps/gpsinput.h jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbcommon.h \ jeeps/../garmin_device_xml.h jeeps/gpsmath.o: jeeps/gpsmath.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -807,7 +807,7 @@ jeeps/gpsmath.o: jeeps/gpsmath.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpsdatum.h jeeps/gpsmem.o: jeeps/gpsmem.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -816,7 +816,7 @@ jeeps/gpsmem.o: jeeps/gpsmem.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpsprot.o: jeeps/gpsprot.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -825,7 +825,7 @@ jeeps/gpsprot.o: jeeps/gpsprot.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpsread.o: jeeps/gpsread.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -834,7 +834,7 @@ jeeps/gpsread.o: jeeps/gpsread.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpsserial.h jeeps/gpsrqst.o: jeeps/gpsrqst.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -843,7 +843,7 @@ jeeps/gpsrqst.o: jeeps/gpsrqst.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpssend.o: jeeps/gpssend.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -852,7 +852,7 @@ jeeps/gpssend.o: jeeps/gpssend.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpsserial.h jeeps/gpsserial.o: jeeps/gpsserial.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -861,7 +861,7 @@ jeeps/gpsserial.o: jeeps/gpsserial.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpsserial.h jeeps/../gbser.h jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -870,7 +870,7 @@ jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbcommon.h jeeps/gpsusbread.o: jeeps/gpsusbread.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -879,7 +879,7 @@ jeeps/gpsusbread.o: jeeps/gpsusbread.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbint.h jeeps/gpsusbsend.o: jeeps/gpsusbsend.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -888,7 +888,7 @@ jeeps/gpsusbsend.o: jeeps/gpsusbsend.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbint.h jeeps/jgpsutil.o: jeeps/jgpsutil.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ + jeeps/../config.h jeeps/../queue.h jeeps/../\ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ @@ -896,26 +896,26 @@ jeeps/jgpsutil.o: jeeps/jgpsutil.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -jogmap.o: jogmap.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +jogmap.o: jogmap.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h -jtr.o: jtr.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +jtr.o: jtr.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ csv_util.h avltree.h -kml.o: kml.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +kml.o: kml.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ xmlgeneric.h grtcirc.h -lmx.o: lmx.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +lmx.o: lmx.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ xmlgeneric.h -lowranceusr.o: lowranceusr.cc defs.h config.h queue.h gbtypes.h \ +lowranceusr.o: lowranceusr.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -lowranceusr4.o: lowranceusr4.cc defs.h config.h queue.h gbtypes.h \ +lowranceusr4.o: lowranceusr4.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h mac/libusb/darwin.o: mac/libusb/darwin.c config.h mac/libusb/usbi.h \ @@ -926,272 +926,272 @@ mac/libusb/error.o: mac/libusb/error.c mac/libusb/usb.h \ mac/libusb/error.h mac/libusb/usb.o: mac/libusb/usb.c mac/libusb/usbi.h mac/libusb/usb.h \ mac/libusb/error.h -mag_pdb.o: mag_pdb.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mag_pdb.o: mag_pdb.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h pdbfile.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -maggeo.o: maggeo.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +maggeo.o: maggeo.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h xmlgeneric.h magellan.h -magnav.o: magnav.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +magnav.o: magnav.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h pdbfile.h -magproto.o: magproto.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +magproto.o: magproto.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h magellan.h gbser.h explorist_ini.h -main.o: main.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +main.o: main.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h csv_util.h -mapasia.o: mapasia.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mapasia.o: mapasia.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -mapsend.o: mapsend.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mapsend.o: mapsend.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h mapsend.h magellan.h -mapsource.o: mapsource.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mapsource.o: mapsource.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h garmin_tables.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -mkshort.o: mkshort.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mkshort.o: mkshort.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -mmo.o: mmo.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +mmo.o: mmo.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ avltree.h -msroute.o: msroute.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +msroute.o: msroute.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h -mtk_locus.o: mtk_locus.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mtk_locus.o: mtk_locus.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h -mtk_logger.o: mtk_logger.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mtk_logger.o: mtk_logger.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h -navicache.o: navicache.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +navicache.o: navicache.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -naviguide.o: naviguide.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +naviguide.o: naviguide.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -navilink.o: navilink.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +navilink.o: navilink.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h navilink.h -navitel.o: navitel.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +navitel.o: navitel.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h -netstumbler.o: netstumbler.cc defs.h config.h queue.h gbtypes.h \ +netstumbler.o: netstumbler.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h -nmea.o: nmea.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +nmea.o: nmea.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h strptime.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -nmn4.o: nmn4.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +nmn4.o: nmn4.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h -nukedata.o: nukedata.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +nukedata.o: nukedata.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h -osm.o: osm.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +osm.o: osm.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ avltree.h xmlgeneric.h -overlay.o: overlay.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +overlay.o: overlay.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h grtcirc.h -ozi.o: ozi.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +ozi.o: ozi.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ csv_util.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -palmdoc.o: palmdoc.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +palmdoc.o: palmdoc.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h pdbfile.h -parse.o: parse.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +parse.o: parse.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h strptime.h -pathaway.o: pathaway.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +pathaway.o: pathaway.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h pdbfile.h strptime.h -pcx.o: pcx.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +pcx.o: pcx.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ garmin_tables.h csv_util.h -pdbfile.o: pdbfile.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +pdbfile.o: pdbfile.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h pdbfile.h -pocketfms_bc.o: pocketfms_bc.cc defs.h config.h queue.h gbtypes.h \ +pocketfms_bc.o: pocketfms_bc.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -pocketfms_fp.o: pocketfms_fp.cc defs.h config.h queue.h gbtypes.h \ +pocketfms_fp.o: pocketfms_fp.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -pocketfms_wp.o: pocketfms_wp.cc defs.h config.h queue.h gbtypes.h \ +pocketfms_wp.o: pocketfms_wp.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h -polygon.o: polygon.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +polygon.o: polygon.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h -position.o: position.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +position.o: position.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h grtcirc.h -psitrex.o: psitrex.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +psitrex.o: psitrex.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h garmin_tables.h -psp.o: psp.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +psp.o: psp.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ grtcirc.h queue.o: queue.cc queue.h -quovadis.o: quovadis.cc quovadis.h defs.h config.h queue.h gbtypes.h \ +quovadis.o: quovadis.cc quovadis.h defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h pdbfile.h -radius.o: radius.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +radius.o: radius.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h grtcirc.h -random.o: random.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +random.o: random.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/gpsmath.h -raymarine.o: raymarine.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +raymarine.o: raymarine.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h -reverse_route.o: reverse_route.cc defs.h config.h queue.h gbtypes.h \ +reverse_route.o: reverse_route.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h -rgbcolors.o: rgbcolors.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +rgbcolors.o: rgbcolors.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -route.o: route.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +route.o: route.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h grtcirc.h -saroute.o: saroute.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +saroute.o: saroute.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h grtcirc.h -sbn.o: sbn.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +sbn.o: sbn.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ navilink.h -sbp.o: sbp.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +sbp.o: sbp.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ navilink.h -session.o: session.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +session.o: session.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -shape.o: shape.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h shapelib/shapefil.h shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h config.h shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h config.h -skyforce.o: skyforce.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h strptime.h -skytraq.o: skytraq.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h -smplrout.o: smplrout.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +smplrout.o: smplrout.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h grtcirc.h -sort.o: sort.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +sort.o: sort.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h -stackfilter.o: stackfilter.cc defs.h config.h queue.h gbtypes.h \ +stackfilter.o: stackfilter.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h -stmsdf.o: stmsdf.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +stmsdf.o: stmsdf.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h strptime.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h grtcirc.h -stmwpp.o: stmwpp.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +stmwpp.o: stmwpp.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h strptime.o: strptime.c config.h strptime.h -subrip.o: subrip.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +subrip.o: subrip.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -swapdata.o: swapdata.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +swapdata.o: swapdata.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h -tef_xml.o: tef_xml.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +tef_xml.o: tef_xml.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -teletype.o: teletype.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +teletype.o: teletype.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -text.o: text.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +text.o: text.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h -tiger.o: tiger.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +tiger.o: tiger.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h -tmpro.o: tmpro.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +tmpro.o: tmpro.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h -tomtom.o: tomtom.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +tomtom.o: tomtom.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -tpg.o: tpg.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +tpg.o: tpg.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -tpo.o: tpo.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +tpo.o: tpo.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -trackfilter.o: trackfilter.cc defs.h config.h queue.h gbtypes.h \ +trackfilter.o: trackfilter.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h strptime.h grtcirc.h xmlgeneric.h -transform.o: transform.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +transform.o: transform.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h filterdefs.h -unicsv.o: unicsv.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +unicsv.o: unicsv.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ @@ -1199,10 +1199,10 @@ unicsv.o: unicsv.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h \ jeeps/gpsmath.h -units.o: units.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +units.o: units.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -util.o: util.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +util.o: util.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ @@ -1211,50 +1211,50 @@ util.o: util.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpsinput.h jeeps/gpsproj.h util_crc.o: util_crc.cc uuid.o: uuid.cc uuid.h -v900.o: v900.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +v900.o: v900.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -vcf.o: vcf.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +vcf.o: vcf.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -vecs.o: vecs.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +vecs.o: vecs.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h gbversion.h -vidaone.o: vidaone.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +vidaone.o: vidaone.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -vitosmt.o: vitosmt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +vitosmt.o: vitosmt.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h grtcirc.h -vitovtt.o: vitovtt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +vitovtt.o: vitovtt.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -vmem.o: vmem.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +vmem.o: vmem.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -vpl.o: vpl.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +vpl.o: vpl.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h -waypt.o: waypt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +waypt.o: waypt.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h grtcirc.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -wbt-200.o: wbt-200.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +wbt-200.o: wbt-200.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h gbser.h grtcirc.h -wfff_xml.o: wfff_xml.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +wfff_xml.o: wfff_xml.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -wintec_tes.o: wintec_tes.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +wintec_tes.o: wintec_tes.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -xcsv.o: xcsv.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +xcsv.o: xcsv.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h csv_util.h jeeps/gpsmath.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ @@ -1262,20 +1262,20 @@ xcsv.o: xcsv.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h xhtmlent.o: xhtmlent.cc -xmlgeneric.o: xmlgeneric.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +xmlgeneric.o: xmlgeneric.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h -xmltag.o: xmltag.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +xmltag.o: xmltag.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h -xol.o: xol.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +xol.o: xol.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ xmlgeneric.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h -yahoo.o: yahoo.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +yahoo.o: yahoo.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ src/core/datetime.h xmlgeneric.h zlib/adler32.o: zlib/adler32.c zlib/zlib.h zlib/zconf.h diff --git a/gpsbabel/alan.cc b/gpsbabel/alan.cc index c7a0c6b2e..cb82c6e5d 100644 --- a/gpsbabel/alan.cc +++ b/gpsbabel/alan.cc @@ -49,44 +49,44 @@ #define TRK_COMMENT_LEN 13 struct wpthdr { - gbuint32 id; - gbint16 num; - gbint16 next; - gbint16 idx[MAXWPT]; - gbuint8 used[MAXWPT]; + uint32_t id; + int16_t num; + int16_t next; + int16_t idx[MAXWPT]; + uint8_t used[MAXWPT]; }; struct wpt { char name[WPT_NAME_LEN]; char comment[WPT_COMMENT_LEN]; struct { - gbint32 x; /* degree * 36000 */ - gbint32 y; /* degree * 36000 */ + int32_t x; /* degree * 36000 */ + int32_t y; /* degree * 36000 */ } pt; - gbint32 date; - gbint32 time; - gbint16 usecount; - gbint8 checked; - gbint8 reserved; + int32_t date; + int32_t time; + int16_t usecount; + int8_t checked; + int8_t reserved; }; struct rtehdr { - gbuint32 id; - gbint16 num; - gbint16 next; - gbint16 idx[MAXRTE]; - gbuint8 used[MAXRTE]; - gbint16 rteno; + uint32_t id; + int16_t num; + int16_t next; + int16_t idx[MAXRTE]; + uint8_t used[MAXRTE]; + int16_t rteno; }; struct rte { char name[RTE_NAME_LEN]; char comment[RTE_COMMENT_LEN]; - gbint16 wptnum; - gbint16 wptidx[MAXWPTINRTE]; - gbint16 reserved; - gbint32 date; - gbint32 time; + int16_t wptnum; + int16_t wptidx[MAXWPTINRTE]; + int16_t reserved; + int32_t date; + int32_t time; }; struct wprdata { @@ -97,33 +97,33 @@ struct wprdata { }; struct trkhdr { - gbint16 totalpt; - gbint16 next; + int16_t totalpt; + int16_t next; char name[TRK_NAME_LEN]; /* 10, null terminated */ char comment[TRK_COMMENT_LEN]; /* 12, null terminated */ - gbuint8 reserved[3]; - gbuint32 occupied; - gbuint32 show; - gbuint32 fill; + uint8_t reserved[3]; + uint32_t occupied; + uint32_t show; + uint32_t fill; }; struct loghdr { - gbuint32 id; - gbint16 num; - gbint16 next; - gbint32 date; - gbint32 time; + uint32_t id; + int16_t num; + int16_t next; + int32_t date; + int32_t time; struct trkhdr trkhdr[MAXTRK]; }; struct trklog { struct { - gbint32 x; /* degree * 36000 */ - gbint32 y; /* degree * 36000 */ + int32_t x; /* degree * 36000 */ + int32_t y; /* degree * 36000 */ } pt[MAXPTINTRK]; struct { - gbint16 speed; /* km/h * 200 */ - gbint16 height; /* m * 5 */ + int16_t speed; /* km/h * 200 */ + int16_t height; /* m * 5 */ } sh[MAXPTINTRK]; }; @@ -156,15 +156,15 @@ struct trldata { #define MAP500_PT_SCALE 36000.0 #define pt2deg(P) ((double)(P) / MAP500_PT_SCALE) -#define deg2pt(D) (gbint32)si_round((double)(D) * MAP500_PT_SCALE) +#define deg2pt(D) (int32_t)si_round((double)(D) * MAP500_PT_SCALE) #define MAP500_ALTITUDE_SCALE 5.0 #define hgt2m(A) ((double)(A) / MAP500_ALTITUDE_SCALE) -#define m2hgt(A) (gbint16)si_round((double)(A) * MAP500_ALTITUDE_SCALE) +#define m2hgt(A) (int16_t)si_round((double)(A) * MAP500_ALTITUDE_SCALE) #define MAP500_SPEED_SCALE 720.0 #define sp2mps(S) ((double)(S) / MAP500_SPEED_SCALE) -#define mps2sp(S) (gbint16)si_round((double)(S) * MAP500_SPEED_SCALE) +#define mps2sp(S) (int16_t)si_round((double)(S) * MAP500_SPEED_SCALE) #define BYTEORDER_TEST 0x04030201 /* 32bit reference value */ enum { @@ -211,24 +211,24 @@ static unsigned int byte_order(void) static void sw_bytes(void* word) { - gbuint8* p = (gbuint8*) word; - gbuint16* r = (gbuint16*) word; + uint8_t* p = (uint8_t*) word; + uint16_t* r = (uint16_t*) word; - *r = (gbuint16)(p[1] << 8 | p[0]); + *r = (uint16_t)(p[1] << 8 | p[0]); } static void sw_words(void* dword) { - gbuint16* p = (gbuint16*) dword; - gbuint32* r = (gbuint32*) dword; + uint16_t* p = (uint16_t*) dword; + uint32_t* r = (uint32_t*) dword; - *r = (gbuint32)(p[0] << 16 | p[1]); + *r = (uint32_t)(p[0] << 16 | p[1]); } static void rev_bytes(void* dword) { - gbuint8* p = (gbuint8*) dword; - gbuint32* r = (gbuint32*) dword; + uint8_t* p = (uint8_t*) dword; + uint32_t* r = (uint32_t*) dword; - *r = (gbuint32)(p[3] << 24 | p[2] << 16 | p[1] << 8 | p[0]); + *r = (uint32_t)(p[3] << 24 | p[2] << 16 | p[1] << 8 | p[0]); } static void swap_wpthdr(struct wpthdr* wpthdr, @@ -443,7 +443,7 @@ static void str2lab(char* dest, const char* src, int len, const char* fmt, } } -static void pack_time(time_t t, gbint32* date, gbint32* time) +static void pack_time(time_t t, int32_t* date, int32_t* time) { struct tm* tm; @@ -452,7 +452,7 @@ static void pack_time(time_t t, gbint32* date, gbint32* time) *time = t % 86400; } -static time_t unpack_time(gbint32 date, gbint32 time) +static time_t unpack_time(int32_t date, int32_t time) { time_t result; short year, month, day; diff --git a/gpsbabel/an1.cc b/gpsbabel/an1.cc index 5f9a9c116..ba5f2e1eb 100644 --- a/gpsbabel/an1.cc +++ b/gpsbabel/an1.cc @@ -165,13 +165,13 @@ Skip(gbfile* f, static double DecodeOrd(long ord) { - return (double)((gbint32)(0x80000000 - ord)) / 0x800000; + return (double)((int32_t)(0x80000000 - ord)) / 0x800000; } static long EncodeOrd(double ord) { - return (gbint32)(0x80000000 - (gbint32)(ord * 0x800000)); + return (int32_t)(0x80000000 - (int32_t)(ord * 0x800000)); } typedef struct { diff --git a/gpsbabel/axim_gpb.cc b/gpsbabel/axim_gpb.cc index 3190576a3..f22ce11ba 100644 --- a/gpsbabel/axim_gpb.cc +++ b/gpsbabel/axim_gpb.cc @@ -42,7 +42,7 @@ static float le_read32_float(const void* src) { float f; - gbint32 i; + int32_t i; i = le_read32(src); memcpy(&f, &i, 4); diff --git a/gpsbabel/bushnell.cc b/gpsbabel/bushnell.cc index a1bed6d7c..a8dada3bb 100644 --- a/gpsbabel/bushnell.cc +++ b/gpsbabel/bushnell.cc @@ -202,7 +202,7 @@ wr_deinit(void) static void bushnell_read(void) { - gbint32 lat_tmp,lon_tmp; + int32_t lat_tmp,lon_tmp; unsigned int proximity; unsigned int icon; waypoint* wpt_tmp = waypt_new(); diff --git a/gpsbabel/bushnell_trl.cc b/gpsbabel/bushnell_trl.cc index 7d1f17332..c60b88840 100644 --- a/gpsbabel/bushnell_trl.cc +++ b/gpsbabel/bushnell_trl.cc @@ -117,8 +117,8 @@ bushnell_read(void) static void bushnell_write_one(const waypoint* wpt) { - gbint32 lat = wpt->latitude * 10000000.0; - gbint32 lon = wpt->longitude * 10000000.0; + int32_t lat = wpt->latitude * 10000000.0; + int32_t lon = wpt->longitude * 10000000.0; trkpt_count++; if (trkpt_count > 4502) { fatal(MYNAME " too many trackpoints. Max is 4502."); diff --git a/gpsbabel/copilot.cc b/gpsbabel/copilot.cc index 93c589e0c..672672143 100644 --- a/gpsbabel/copilot.cc +++ b/gpsbabel/copilot.cc @@ -36,7 +36,7 @@ struct record0 { pdb_double latitude; /* PDB double format, */ pdb_double longitude; /* similarly, neg = east */ pdb_double magvar; /* magnetic variation in degrees, neg = east */ - gbuint32 elevation; /* feet */ + uint32_t elevation; /* feet */ }; struct record1 { diff --git a/gpsbabel/coto.cc b/gpsbabel/coto.cc index b2141badb..99956abcb 100644 --- a/gpsbabel/coto.cc +++ b/gpsbabel/coto.cc @@ -57,17 +57,17 @@ struct record_track { pdb_double arc; /* Course, unknown dimension */ pdb_double x,y; /* Internal virtual coordinates used for drawing the track on the Palm */ - gbuint16 alt; /* Altitude */ + uint16_t alt; /* Altitude */ /* accuracy and precision information for use where applicable */ - gbuint16 hdop; /* _dop * 10 */ - gbuint16 vdop; - gbuint16 pdop; - gbuint8 sat_tracked; - gbuint8 fix_quality; - - gbuint16 speed; /* *10 */ - gbuint32 time; /* Palm Time */ + uint16_t hdop; /* _dop * 10 */ + uint16_t vdop; + uint16_t pdop; + uint8_t sat_tracked; + uint8_t fix_quality; + + uint16_t speed; /* *10 */ + uint32_t time; /* Palm Time */ }; struct record_wpt { @@ -83,11 +83,11 @@ struct record_wpt { typedef char appinfo_category[16]; typedef struct appinfo { - gbuint8 U0; - gbuint8 renamedCategories; + uint8_t U0; + uint8_t renamedCategories; appinfo_category categories[CATEGORY_NAME_LENGTH]; - gbuint8 ids[16]; - gbuint8 maxid; + uint8_t ids[16]; + uint8_t maxid; } appinfo_t; #define APPINFO_SIZE sizeof(appinfo_t) @@ -340,7 +340,7 @@ coto_wpt_write(const waypoint* wpt) char* notes = NULL; char* shortname = NULL; int size; - gbuint8 cat = 0; + uint8_t cat = 0; int i; mkshort_wr_handle = mkshort_new_handle(); @@ -398,7 +398,7 @@ coto_wpt_write(const waypoint* wpt) } } - pdb_write_rec(file_out, 0, cat, ct++, (const gbuint8*)rec, size); + pdb_write_rec(file_out, 0, cat, ct++, (const uint8_t*)rec, size); xfree(shortname); xfree(rec); diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index f768e14f9..b310afd17 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -22,7 +22,6 @@ #include "config.h" #endif #include "queue.h" -#include "gbtypes.h" #if HAVE_LIBZ #include #elif !ZLIB_INHIBITED @@ -149,6 +148,8 @@ * Common definitions. There should be no protocol or file-specific * data in this file. */ + + #define BASE_STRUCT(memberp, struct_type, member_name) \ ((struct_type *)((char *)(memberp) - offsetof(struct_type, member_name))) @@ -823,7 +824,7 @@ typedef struct arglist { char** argval; const char* helpstring; const char* defaultvalue; - const gbuint32 argtype; + const uint32_t argtype; const char* minvalue; /* minimum value for numeric options */ const char* maxvalue; /* maximum value for numeric options */ char* argvalptr; /* !!! internal helper. Not used in definitions !!! */ @@ -1122,8 +1123,8 @@ typedef enum { /* bit manipulation functions (util.c) */ -char gb_getbit(const void* buf, const gbuint32 nr); -void gb_setbit(void* buf, const gbuint32 nr); +char gb_getbit(const void* buf, const uint32_t nr); +void gb_setbit(void* buf, const uint32_t nr); void* gb_int2ptr(const int i); int gb_ptr2int(const void* p); diff --git a/gpsbabel/delbin.cc b/gpsbabel/delbin.cc index bf3f05c3f..bb3e5e1d3 100644 --- a/gpsbabel/delbin.cc +++ b/gpsbabel/delbin.cc @@ -221,9 +221,9 @@ typedef enum { } nuke_dest; typedef struct { - gbuint8 type; - gbuint8 mode; - gbuint8 location; + uint8_t type; + uint8_t mode; + uint8_t location; char object_name[64]; } msg_delete_t; @@ -232,20 +232,20 @@ typedef struct { // Input Waypoint Message // Message ID: 0xB014 typedef struct { - gbuint8 total[4]; // U32 - gbuint8 index[4]; // U32 - gbuint8 year; - gbuint8 month; - gbuint8 day; - gbuint8 hour; - gbuint8 minute; - gbuint8 second; - gbuint8 latitude[4]; // S32 rad * 100000000 - gbuint8 longitude[4]; // S32 rad * 100000000 - gbuint8 elevation[4]; // F32 meters - gbuint8 color; - gbuint8 symbol; - gbuint8 name_size; + uint8_t total[4]; // U32 + uint8_t index[4]; // U32 + uint8_t year; + uint8_t month; + uint8_t day; + uint8_t hour; + uint8_t minute; + uint8_t second; + uint8_t latitude[4]; // S32 rad * 100000000 + uint8_t longitude[4]; // S32 rad * 100000000 + uint8_t elevation[4]; // F32 meters + uint8_t color; + uint8_t symbol; + uint8_t name_size; char name[1]; // note_size[2] U16 // note[note_size] @@ -257,9 +257,9 @@ typedef struct { // input waypoint note // Message ID: 0xB016 typedef struct { - gbuint8 index[2]; - gbuint8 total[2]; - gbuint8 name_size; + uint8_t index[2]; + uint8_t total[2]; + uint8_t name_size; char name[1]; // note_size[2] // note[note_size] @@ -270,42 +270,42 @@ typedef struct { // Input Track Point Message // Message ID: 0xB036 typedef struct { - gbuint8 total[4]; // U32 - gbuint8 index[4]; // U32 - gbuint8 number; + uint8_t total[4]; // U32 + uint8_t index[4]; // U32 + uint8_t number; struct { - gbuint8 year; - gbuint8 month; - gbuint8 day; - gbuint8 hour; - gbuint8 minute; - gbuint8 second; - gbuint8 latitude[4]; // S32 rad * 100000000 - gbuint8 longitude[4]; // S32 rad * 100000000 - gbuint8 elevation[4]; // F32 meters - gbuint8 speed[2]; // U16 km/h * 10 - gbuint8 heading[2]; // U16 deg * 100 - gbuint8 status; + uint8_t year; + uint8_t month; + uint8_t day; + uint8_t hour; + uint8_t minute; + uint8_t second; + uint8_t latitude[4]; // S32 rad * 100000000 + uint8_t longitude[4]; // S32 rad * 100000000 + uint8_t elevation[4]; // F32 meters + uint8_t speed[2]; // U16 km/h * 10 + uint8_t heading[2]; // U16 deg * 100 + uint8_t status; } point[1]; } msg_track_point_t; // Output Track Header (Name) Message // Message ID: 0xB032 typedef struct { - gbuint8 total_tracks[2]; // U16 - gbuint8 number[2]; // U16 + uint8_t total_tracks[2]; // U16 + uint8_t number[2]; // U16 char name[32]; - gbuint8 total_points[4]; // U32 - gbuint8 year; - gbuint8 month; - gbuint8 day; - gbuint8 hour; - gbuint8 minute; - gbuint8 second; - gbuint8 color[2]; // U16 - gbuint8 distance[4]; // U32 m - gbuint8 duration[4]; // U32 sec - gbuint8 comment_size[2]; // U16 + uint8_t total_points[4]; // U32 + uint8_t year; + uint8_t month; + uint8_t day; + uint8_t hour; + uint8_t minute; + uint8_t second; + uint8_t color[2]; // U16 + uint8_t distance[4]; // U32 m + uint8_t duration[4]; // U32 sec + uint8_t comment_size[2]; // U16 char comment[1]; } msg_track_header_t; @@ -313,28 +313,28 @@ typedef struct { // Message ID: 0xB035 typedef struct { char name[32]; - gbuint8 total_points[4]; // U32 - gbuint8 year; - gbuint8 month; - gbuint8 day; - gbuint8 hour; - gbuint8 minute; - gbuint8 second; - gbuint8 color[2]; // U16 - gbuint8 comment_size[2]; // U16 + uint8_t total_points[4]; // U32 + uint8_t year; + uint8_t month; + uint8_t day; + uint8_t hour; + uint8_t minute; + uint8_t second; + uint8_t color[2]; // U16 + uint8_t comment_size[2]; // U16 char comment[1]; } msg_track_header_in_t; // Output Route Shape Message // Message ID: 0xB054 typedef struct { - gbuint8 total[4]; // U32 - gbuint8 index[4]; // U32 - gbuint8 number; - gbuint8 reserved; + uint8_t total[4]; // U32 + uint8_t index[4]; // U32 + uint8_t number; + uint8_t reserved; struct { - gbuint8 latitude[4]; // S32 rad * 100000000 - gbuint8 longitude[4]; // S32 rad * 100000000 + uint8_t latitude[4]; // S32 rad * 100000000 + uint8_t longitude[4]; // S32 rad * 100000000 } point[1]; } msg_route_shape_t; @@ -343,21 +343,21 @@ typedef struct { // Input Route Itin Point Message // Message ID: 0xB056 typedef struct { - gbuint8 total[4]; // U32 - gbuint8 index[4]; // U32 + uint8_t total[4]; // U32 + uint8_t index[4]; // U32 char name[32]; - gbuint8 latitude[4]; // S32 rad * 100000000 - gbuint8 longitude[4]; // S32 rad * 100000000 - gbuint8 time_from_start[4]; // U32 sec - gbuint8 distance_from_start[4]; // F32 km - gbuint8 bearing_in[2]; // U16 deg * 100 - gbuint8 bearing_out[2]; // U16 deg * 100 - gbuint8 bearing_next[2]; // U16 deg * 100 - gbuint8 itinerary_type; - gbuint8 turn_type; - gbuint8 road_class[2]; // U16 - gbuint8 feature_code[4]; // U32 - gbuint8 exit_label_size; + uint8_t latitude[4]; // S32 rad * 100000000 + uint8_t longitude[4]; // S32 rad * 100000000 + uint8_t time_from_start[4]; // U32 sec + uint8_t distance_from_start[4]; // F32 km + uint8_t bearing_in[2]; // U16 deg * 100 + uint8_t bearing_out[2]; // U16 deg * 100 + uint8_t bearing_next[2]; // U16 deg * 100 + uint8_t itinerary_type; + uint8_t turn_type; + uint8_t road_class[2]; // U16 + uint8_t feature_code[4]; // U32 + uint8_t exit_label_size; char exit_label[1]; // comment_size U8 // comment[comment_size] @@ -367,67 +367,67 @@ typedef struct { // Output Route Header (Name) Message // Message ID: 0xB052 typedef struct { - gbuint8 total[2]; // U16 - gbuint8 index[2]; // U16 + uint8_t total[2]; // U16 + uint8_t index[2]; // U16 char name[64]; - gbuint8 type; - gbuint8 total_route_point[4]; // U32 - gbuint8 total_shape_point[4]; // U32 + uint8_t type; + uint8_t total_route_point[4]; // U32 + uint8_t total_shape_point[4]; // U32 } msg_route_header_t; // Input Upload Route Header Message // Message ID: 0xB055 typedef struct { char name[64]; - gbuint8 type; - gbuint8 total_route_point[4]; // U32 - gbuint8 total_shape_point[4]; // U32 + uint8_t type; + uint8_t total_route_point[4]; // U32 + uint8_t total_shape_point[4]; // U32 } msg_route_header_in_t; // Output Navigation Message // Message ID: 0xA010 typedef struct { - gbuint8 gps_week[2]; // U16 - gbuint8 time_of_week[8]; // D64 sec - gbuint8 year[2]; // U16 - gbuint8 month; - gbuint8 day; - gbuint8 hour; - gbuint8 minute; - gbuint8 second; - gbuint8 satellites; - gbuint8 latitude[8]; // D64 deg - gbuint8 longitude[8]; // D64 deg - gbuint8 elevation[8]; // D64 meters - gbuint8 geoid_offset[2]; // S16 meters * 10 - gbuint8 speed[4]; // F32 km/h - gbuint8 heading[2]; // U16 deg * 100 - gbuint8 magnetic_variation[2]; // S16 deg * 100 - gbuint8 fix_status; + uint8_t gps_week[2]; // U16 + uint8_t time_of_week[8]; // D64 sec + uint8_t year[2]; // U16 + uint8_t month; + uint8_t day; + uint8_t hour; + uint8_t minute; + uint8_t second; + uint8_t satellites; + uint8_t latitude[8]; // D64 deg + uint8_t longitude[8]; // D64 deg + uint8_t elevation[8]; // D64 meters + uint8_t geoid_offset[2]; // S16 meters * 10 + uint8_t speed[4]; // F32 km/h + uint8_t heading[2]; // U16 deg * 100 + uint8_t magnetic_variation[2]; // S16 deg * 100 + uint8_t fix_status; } msg_navigation_t; // Output Satellite Info Message // Message ID: 0xA020 typedef struct { - gbuint8 gps_week[2]; // U16 - gbuint8 time_of_week[8]; // D64 sec - gbuint8 hdop[2]; // U16 - gbuint8 vdop[2]; // U16 - gbuint8 pdop[2]; // U16 - gbuint8 number; + uint8_t gps_week[2]; // U16 + uint8_t time_of_week[8]; // D64 sec + uint8_t hdop[2]; // U16 + uint8_t vdop[2]; // U16 + uint8_t pdop[2]; // U16 + uint8_t number; struct { - gbuint8 prn; - gbuint8 azimuth[2]; // S16 deg? * 100 - gbuint8 elevation[2]; // S16 deg? * 100 - gbuint8 Cn0[2]; // U16 snr * 100 - gbuint8 status; + uint8_t prn; + uint8_t azimuth[2]; // S16 deg? * 100 + uint8_t elevation[2]; // S16 deg? * 100 + uint8_t Cn0[2]; // U16 snr * 100 + uint8_t status; } sat[1]; } msg_satellite_t; // Output Version Message // Message ID: 0xA001 typedef struct { - gbuint8 firmware_version[4]; + uint8_t firmware_version[4]; char company[32]; char product[32]; char firmware[32]; @@ -439,19 +439,19 @@ typedef struct { // Output Device Capabilities Message // Message ID: 0xB001 typedef struct { - gbuint8 max_waypoints[4]; // U32 - gbuint8 max_tracks[2]; // U16 - gbuint8 max_track_points[4]; // U32 - gbuint8 max_routes[2]; // U16 - gbuint8 max_route_points[4]; // U32 - gbuint8 max_route_shape_points[4]; // U32 - gbuint8 max_maps[2]; // U16 - gbuint8 min_map_version[2]; // U16 - gbuint8 max_map_version[2]; // U16 - gbuint8 total_internal_file_memory[4]; // U32 - gbuint8 avail_internal_file_memory[4]; // U32 - gbuint8 total_external_file_memory[4]; // U32 - gbuint8 avail_external_file_memory[4]; // U32 + uint8_t max_waypoints[4]; // U32 + uint8_t max_tracks[2]; // U16 + uint8_t max_track_points[4]; // U32 + uint8_t max_routes[2]; // U16 + uint8_t max_route_points[4]; // U32 + uint8_t max_route_shape_points[4]; // U32 + uint8_t max_maps[2]; // U16 + uint8_t min_map_version[2]; // U16 + uint8_t max_map_version[2]; // U16 + uint8_t total_internal_file_memory[4]; // U32 + uint8_t avail_internal_file_memory[4]; // U32 + uint8_t total_external_file_memory[4]; // U32 + uint8_t avail_external_file_memory[4]; // U32 } msg_capabilities_t; //----------------------------------------------------------------------------- @@ -484,8 +484,8 @@ debug_out_time(const char* s) //----------------------------------------------------------------------------- -static gbuint16 -checksum(const gbuint8* p, unsigned n) +static uint16_t +checksum(const uint8_t* p, unsigned n) { int x = 0; unsigned i; @@ -496,7 +496,7 @@ checksum(const gbuint8* p, unsigned n) if (n & 1) { x += *p; } - return (gbuint16)-x; + return (uint16_t)-x; } //----------------------------------------------------------------------------- @@ -511,7 +511,7 @@ packet_read(void* buf) } if (global_opts.debug_level >= DBGLVL_H) { unsigned j; - const gbuint8* p = (const gbuint8*) buf; + const uint8_t* p = (const uint8_t*) buf; debug_out_time("pcktrd"); for (j = 0; j < n; j++) { @@ -535,7 +535,7 @@ packet_write(const void* buf, unsigned size) unsigned n; if (global_opts.debug_level >= DBGLVL_H) { unsigned j; - const gbuint8* p = (const gbuint8*) buf; + const uint8_t* p = (const uint8_t*) buf; debug_out_time("pcktwr"); for (j = 0; j < size; j++) { @@ -564,7 +564,7 @@ typedef struct { unsigned size; // buffer size unsigned capacity; - gbuint8* buf; + uint8_t* buf; // convenience pointer to message data area void* data; } message_t; @@ -573,7 +573,7 @@ static void message_init(message_t* m) { m->capacity = 100; - m->buf = (gbuint8*)xmalloc(m->capacity); + m->buf = (uint8_t*)xmalloc(m->capacity); m->data = m->buf + 2 + 8; } @@ -582,7 +582,7 @@ message_init_size(message_t* m, unsigned size) { m->size = size; m->capacity = 2 + 8 + size + 4; - m->buf = (gbuint8*)xmalloc(m->capacity); + m->buf = (uint8_t*)xmalloc(m->capacity); m->data = m->buf + 2 + 8; } @@ -601,7 +601,7 @@ message_ensure_size(message_t* m, unsigned size) if (m->capacity < 2 + 8 + size + 4) { m->capacity = 2 + 8 + size + 4; xfree(m->buf); - m->buf = (gbuint8*)xmalloc(m->capacity); + m->buf = (uint8_t*)xmalloc(m->capacity); m->data = m->buf + 2 + 8; } } @@ -620,7 +620,7 @@ message_write(unsigned msg_id, message_t* m) unsigned chksum; unsigned count; unsigned n; - gbuint8* p = m->buf; + uint8_t* p = m->buf; // header (2 start bytes filled in later) p[2] = 0xdb; @@ -631,7 +631,7 @@ message_write(unsigned msg_id, message_t* m) chksum = checksum(p + 2, 6); le_write16(p + 8, chksum); // message data (filled in by caller) - chksum = checksum((gbuint8*) m->data, m->size); + chksum = checksum((uint8_t*) m->data, m->size); n = 2 + 8 + m->size; // trailer (checksum and marker bytes) le_write16(p + n, chksum); @@ -640,8 +640,8 @@ message_write(unsigned msg_id, message_t* m) // size of message not counting packet start bytes count = 8 + m->size + 4; do { - const gbuint8 save0 = p[0]; - const gbuint8 save1 = p[1]; + const uint8_t save0 = p[0]; + const uint8_t save1 = p[1]; n = delbin_os_packet_size - 2; if (n > count) { n = count; @@ -663,9 +663,9 @@ message_write(unsigned msg_id, message_t* m) // read from the payload of a single packet static unsigned -read_depacketize_1(gbuint8** p, unsigned n, int new_packet) +read_depacketize_1(uint8_t** p, unsigned n, int new_packet) { - static gbuint8 buf[256]; + static uint8_t buf[256]; static unsigned buf_i, buf_n; if (new_packet) { buf_n = 0; @@ -688,10 +688,10 @@ read_depacketize_1(gbuint8** p, unsigned n, int new_packet) // read from packet payloads until request is fulfilled static void -read_depacketize(gbuint8* buf, unsigned n) +read_depacketize(uint8_t* buf, unsigned n) { while (n) { - gbuint8* p; + uint8_t* p; unsigned nn = read_depacketize_1(&p, n, FALSE); memcpy(buf, p, nn); n -= nn; @@ -708,8 +708,8 @@ message_read_1(unsigned msg_id, message_t* m) for (;;) { unsigned total; unsigned n; - gbuint8 buf[8]; - gbuint8* p; + uint8_t buf[8]; + uint8_t* p; n = read_depacketize_1(&p, 8, FALSE); memset(buf, 0, 8); @@ -727,9 +727,9 @@ message_read_1(unsigned msg_id, message_t* m) m->buf[0] = m->buf[1] = 0; memcpy(m->buf + 2, buf, 8); // read message body and trailer - read_depacketize((gbuint8*) m->data, total); - p = (gbuint8*)m->data + m->size; - if (checksum((gbuint8*) m->data, m->size) == le_readu16(p) && + read_depacketize((uint8_t*) m->data, total); + p = (uint8_t*)m->data + m->size; + if (checksum((uint8_t*) m->data, m->size) == le_readu16(p) && p[2] == 0xad && p[3] == 0xbc) { if (global_opts.debug_level >= DBGLVL_M) { warning(MYNAME ": received %x\n", id); @@ -789,7 +789,7 @@ message_read(unsigned msg_id, message_t* m) break; } if (id == MSG_ERROR) { - const gbuint8* p = (const gbuint8*) m->data; + const uint8_t* p = (const uint8_t*) m->data; fatal(MYNAME ": device error %u: \"%s\"\n", *p, p + 1); } message_ack(id, m); @@ -963,22 +963,22 @@ send_batch(void) // Coordinate conversion static double -delbin_rad2deg(gbint32 x) +delbin_rad2deg(int32_t x) { return x * ((180 / M_PI) / 100000000); } -static gbint32 +static int32_t delbin_deg2rad(double x) { - return (gbint32)(x * ((M_PI / 180) * 100000000)); + return (int32_t)(x * ((M_PI / 180) * 100000000)); } //----------------------------------------------------------------------------- // Waypoint reading static time_t -decode_time(const gbuint8* p) +decode_time(const uint8_t* p) { struct tm t; t.tm_year = p[0]; @@ -1124,7 +1124,7 @@ read_waypoints(void) // Waypoint writing static void -encode_time(time_t time_, gbuint8* p) +encode_time(time_t time_, uint8_t* p) { const struct tm* t = gmtime(&time_); p[0] = t->tm_year; @@ -1496,7 +1496,7 @@ write_waypoints(void) // Track reading static void -decode_sat_fix(waypoint* wp, const gbuint8 status) +decode_sat_fix(waypoint* wp, const uint8_t status) { switch (status & 3) { case 1: @@ -1723,10 +1723,10 @@ write_track_points(void) le_write_float(p->point[j].elevation, f); f = WAYPT_GET(wp, speed, 0); f *= (60 * 60) / 100; - le_write16(p->point[j].speed, (gbuint16)f); + le_write16(p->point[j].speed, (uint16_t)f); f = WAYPT_GET(wp, course, 0); f *= 100; - le_write16(p->point[j].heading, (gbuint16)f); + le_write16(p->point[j].heading, (uint16_t)f); switch (wp->fix) { default: p->point[j].status = 0; @@ -2947,7 +2947,7 @@ linuxhid_os_packet_write(const void* buf, unsigned size) { struct hiddev_usage_ref_multi urefm; struct hiddev_report_info rinfo; - const gbuint8* p = (const gbuint8*) buf; + const uint8_t* p = (const uint8_t*) buf; unsigned i; for (i = 0; i < size; i++) { diff --git a/gpsbabel/destinator.cc b/gpsbabel/destinator.cc index 3543fe3a3..d48c2b792 100644 --- a/gpsbabel/destinator.cc +++ b/gpsbabel/destinator.cc @@ -63,16 +63,16 @@ gmsd_init(waypoint* wpt) static char* read_wcstr(const int discard) { - gbint16* buff = NULL, c; + int16_t* buff = NULL, c; int size = 0, pos = 0; while (gbfread(&c, sizeof(c), 1, fin) && (c != 0)) { if (size == 0) { size = 16; - buff = (gbint16*) xmalloc(size * sizeof(*buff)); + buff = (int16_t*) xmalloc(size * sizeof(*buff)); } else if (pos == size) { size += 16; - buff = (gbint16*) xrealloc(buff, size * sizeof(*buff)); + buff = (int16_t*) xrealloc(buff, size * sizeof(*buff)); } buff[pos] = c; pos += 1; @@ -313,7 +313,7 @@ destinator_read_trk(void) wpt->fix = (fix_type) gbfgetint32(fin); wpt->sat = gbfgetint32(fin); - gbfseek(fin, 12 * sizeof(gbint32), SEEK_CUR); /* SAT info */ + gbfseek(fin, 12 * sizeof(int32_t), SEEK_CUR); /* SAT info */ date = gbfgetint32(fin); double milliseconds = gbfgetflt(fin); diff --git a/gpsbabel/dg-100.cc b/gpsbabel/dg-100.cc index b6ffbd9e7..53ba3d2e3 100644 --- a/gpsbabel/dg-100.cc +++ b/gpsbabel/dg-100.cc @@ -87,7 +87,7 @@ const unsigned dg100_numcommands = sizeof(dg100_commands) / sizeof(dg100_command struct dynarray16 { unsigned count; /* number of elements used */ unsigned limit; /* number of elements allocated */ - gbint16* data; + int16_t* data; }; /* helper functions */ @@ -110,10 +110,10 @@ dynarray16_init(struct dynarray16* a, unsigned limit) { a->count = 0; a->limit = limit; - a->data = (gbint16*) xmalloc(sizeof(a->data[0]) * a->limit); + a->data = (int16_t*) xmalloc(sizeof(a->data[0]) * a->limit); } -static gbint16* +static int16_t* dynarray16_alloc(struct dynarray16* a, unsigned n) { unsigned oldcount, need; @@ -126,7 +126,7 @@ dynarray16_alloc(struct dynarray16* a, unsigned n) need = a->count - a->limit; need = (need > elements_per_chunk) ? need : elements_per_chunk; a->limit += need; - a->data = (gbint16*) xrealloc(a->data, sizeof(a->data[0]) * a->limit); + a->data = (int16_t*) xrealloc(a->data, sizeof(a->data[0]) * a->limit); } return(a->data + oldcount); } @@ -219,7 +219,7 @@ bin2deg(int val) } static void -process_gpsfile(gbuint8 data[], route_head** track) +process_gpsfile(uint8_t data[], route_head** track) { const int recordsizes[3] = {8, 20, 32}; int i, style, recsize; @@ -304,10 +304,10 @@ process_gpsfile(gbuint8 data[], route_head** track) } } -static gbuint16 -dg100_checksum(gbuint8 buf[], int count) +static uint16_t +dg100_checksum(uint8_t buf[], int count) { - gbuint16 sum = 0; + uint16_t sum = 0; int i; for (i = 0; i < count; i++) { @@ -320,10 +320,10 @@ dg100_checksum(gbuint8 buf[], int count) /* communication functions */ static size_t -dg100_send(gbuint8 cmd, const void* payload, size_t count) +dg100_send(uint8_t cmd, const void* payload, size_t count) { - gbuint8 frame[FRAME_MAXLEN]; - gbuint16 checksum, payload_len; + uint8_t frame[FRAME_MAXLEN]; + uint16_t checksum, payload_len; size_t framelen, param_len; int n; @@ -387,13 +387,13 @@ dg100_recv_byte() * framing around the data), so the caller must copy the data before calling * this function again */ static int -dg100_recv_frame(struct dg100_command** cmdinfo_result, gbuint8** payload) +dg100_recv_frame(struct dg100_command** cmdinfo_result, uint8_t** payload) { - static gbuint8 buf[FRAME_MAXLEN]; - gbuint16 frame_start_seq, payload_len_field; - gbuint16 payload_end_seq, payload_checksum, frame_end_seq; - gbuint16 frame_head, numheaders, sum; - gbuint8 c, cmd; + static uint8_t buf[FRAME_MAXLEN]; + uint16_t frame_start_seq, payload_len_field; + uint16_t payload_end_seq, payload_checksum, frame_end_seq; + uint16_t frame_head, numheaders, sum; + uint8_t c, cmd; int i, param_len, frame_len; struct dg100_command* cmdinfo; @@ -519,11 +519,11 @@ dg100_recv_frame(struct dg100_command** cmdinfo_result, gbuint8** payload) /* return value: number of bytes copied into buf, -1 on error */ static int -dg100_recv(gbuint8 expected_id, void* buf, unsigned int len) +dg100_recv(uint8_t expected_id, void* buf, unsigned int len) { int n; struct dg100_command* cmdinfo; - gbuint8* data; + uint8_t* data; unsigned int copysize, trailing_bytes; n = dg100_recv_frame(&cmdinfo, &data); @@ -550,11 +550,11 @@ dg100_recv(gbuint8 expected_id, void* buf, unsigned int len) /* the number of bytes to be sent is determined by cmd, * count is the size of recvbuf */ static int -dg100_request(gbuint8 cmd, const void* sendbuf, void* recvbuf, size_t count) +dg100_request(uint8_t cmd, const void* sendbuf, void* recvbuf, size_t count) { struct dg100_command* cmdinfo; int n, i, frames, fill; - gbuint8* buf; + uint8_t* buf; cmdinfo = dg100_findcmd(cmd); assert(cmdinfo != NULL); @@ -563,7 +563,7 @@ dg100_request(gbuint8 cmd, const void* sendbuf, void* recvbuf, size_t count) /* the number of frames the answer will comprise */ frames = (cmd == dg100cmd_getfile) ? 2 : 1; /* alias pointer for easy typecasting */ - buf = (gbuint8*) recvbuf; + buf = (uint8_t*) recvbuf; fill = 0; for (i = 0; i < frames; i++) { n = dg100_recv(cmd, buf + fill, count - fill); @@ -579,10 +579,10 @@ dg100_request(gbuint8 cmd, const void* sendbuf, void* recvbuf, size_t count) static void dg100_getfileheaders(struct dynarray16* headers) { - gbuint8 request[2]; - gbuint8 answer[FRAME_MAXLEN]; + uint8_t request[2]; + uint8_t answer[FRAME_MAXLEN]; int seqnum; - gbint16 numheaders, nextheader, *h; + int16_t numheaders, nextheader, *h; int i, offset; nextheader = 0; @@ -618,10 +618,10 @@ dg100_getfileheaders(struct dynarray16* headers) } static void -dg100_getfile(gbint16 num, route_head** track) +dg100_getfile(int16_t num, route_head** track) { - gbuint8 request[2]; - gbuint8 answer[2048]; + uint8_t request[2]; + uint8_t answer[2048]; be_write16(request, num); dg100_request(dg100cmd_getfile, request, answer, sizeof(answer)); @@ -651,8 +651,8 @@ dg100_getfiles() static int dg100_erase() { - gbuint8 request[2] = { 0xFF, 0xFF }; - gbuint8 answer[4]; + uint8_t request[2] = { 0xFF, 0xFF }; + uint8_t answer[4]; dg100_request(dg100cmd_erase, request, answer, sizeof(answer)); if (be_read32(answer) != 1) { diff --git a/gpsbabel/dmtlog.cc b/gpsbabel/dmtlog.cc index 762076383..f886b5120 100644 --- a/gpsbabel/dmtlog.cc +++ b/gpsbabel/dmtlog.cc @@ -391,10 +391,10 @@ static void read_CTrackFile(const int version) { char buf[128]; - gbuint32 ver; - gbint32 tcount, wcount; - gbint16 u1; - gbint32 ux; + uint32_t ver; + int32_t tcount, wcount; + int16_t u1; + int32_t ux; route_head* track; int i; int datum; @@ -521,7 +521,7 @@ read_CTrackFile(const int version) while (wcount > 0) { waypoint* wpt; - gbint32 namect, i; + int32_t namect, i; wcount--; @@ -568,8 +568,8 @@ inflate_buff(const char* buff, const size_t size, char** out_buff) z_stream strm; char out[DEFLATE_BUFF_SIZE]; char* cout = NULL; - gbuint32 bytes = 0; - gbuint32 have; + uint32_t bytes = 0; + uint32_t have; strm.zalloc = Z_NULL; strm.zfree = Z_NULL; @@ -803,7 +803,7 @@ dmtlog_write(void) gbfputint32(4, fout); gbfputint32(1, fout); gbfputint32(0x100001, fout); - gbfputuint32((const gbuint32)gpsbabel_time, fout); + gbfputuint32((const uint32_t)gpsbabel_time, fout); header_written = 0; this_index = 0; diff --git a/gpsbabel/enigma.cc b/gpsbabel/enigma.cc index a2b4dcbdc..28d75c99d 100644 --- a/gpsbabel/enigma.cc +++ b/gpsbabel/enigma.cc @@ -56,20 +56,20 @@ #define WTYPE_ALTITUDECHANGE 26 // Location at which altitude should be changed union wpt_data { - gbint32 wp_altitude; // Waypoint type 0-6,8: waypoint altitude in feet - gbint32 tg_altitude; // Waypoint type 26: target altitude in feet - gbuint32 frequency; // Waypoint type 9-25: freq in steps of 1000Hz (118Mhz = 180000) - gbint32 dummy; // waypoint type 7, unused + int32_t wp_altitude; // Waypoint type 0-6,8: waypoint altitude in feet + int32_t tg_altitude; // Waypoint type 26: target altitude in feet + uint32_t frequency; // Waypoint type 9-25: freq in steps of 1000Hz (118Mhz = 180000) + int32_t dummy; // waypoint type 7, unused }; typedef struct enigma_wpt { - gbint32 latitude; - gbint32 longitude; + int32_t latitude; + int32_t longitude; union wpt_data data; - gbuint8 waypoint_type; - gbuint8 shortname_len; + uint8_t waypoint_type; + uint8_t shortname_len; char shortname[6]; - gbuint8 longname_len; + uint8_t longname_len; char longname[27]; } ENIGMA_WPT; @@ -81,7 +81,7 @@ rd_init(const char* fname) file_in = gbfopen_le(fname, "rb", MYNAME); } -gbint32 decToEnigmaPosition(double val) +int32_t decToEnigmaPosition(double val) { int degrees = fabs(val); double frac = fabs(val) - degrees; @@ -91,7 +91,7 @@ gbint32 decToEnigmaPosition(double val) return sign * (enigmadeg + enigmafrac); } -float enigmaPositionToDec(gbint32 val) +float enigmaPositionToDec(int32_t val) { int deg = abs(val) / 180000; int enigmafrac = abs(val) % 180000; diff --git a/gpsbabel/exif.cc b/gpsbabel/exif.cc index 377b7144b..882342697 100644 --- a/gpsbabel/exif.cc +++ b/gpsbabel/exif.cc @@ -102,14 +102,14 @@ typedef struct exif_tag_s { queue Q; - gbuint16 id; - gbuint16 type; - gbuint32 count; - gbuint32 value; - gbuint32 origin; - gbuint32 size; + uint16_t id; + uint16_t type; + uint32_t count; + uint32_t value; + uint32_t origin; + uint32_t size; #ifdef EXIF_DBG - gbuint32 offs; + uint32_t offs; #endif unsigned char data_is_dynamic:1; void* data; @@ -117,15 +117,15 @@ typedef struct exif_tag_s { typedef struct exif_ifd_s { queue Q; - gbuint32 next_ifd; - gbuint16 nr; - gbuint16 count; + uint32_t next_ifd; + uint16_t nr; + uint16_t count; queue tags; } exif_ifd_t, *exif_ifd_p; typedef struct exif_app_s { queue Q; - gbuint16 marker; + uint16_t marker; gbsize_t len; gbfile* fcache; gbfile* fexif; @@ -142,7 +142,7 @@ static char* exif_fout_name; static char* opt_filename, *opt_overwrite, *opt_frame, *opt_name; -static gbuint8 writer_gps_tag_version[4] = {2, 0, 0, 0}; +static uint8_t writer_gps_tag_version[4] = {2, 0, 0, 0}; arglist_t exif_args[] = { { "filename", &opt_filename, "Set waypoint name to source filename", "Y", ARGTYPE_BOOL, ARG_NOMINMAX }, @@ -174,10 +174,10 @@ print_buff(const char* buf, int sz, const char* cmt) } #endif -static gbuint16 -exif_type_size(const gbuint16 type) +static uint16_t +exif_type_size(const uint16_t type) { - gbuint16 size; + uint16_t size; switch (type) { case EXIF_TYPE_BYTE: @@ -241,7 +241,7 @@ static double exif_read_double(const exif_tag_t* tag, const int index) { unsigned int num, den; - gbint32* data = (gbint32*)tag->data; + int32_t* data = (int32_t*)tag->data; num = data[index * 2]; den = data[(index * 2) + 1]; @@ -349,17 +349,17 @@ exif_release_apps(void) } } -static gbuint32 +static uint32_t exif_ifd_size(exif_ifd_t* ifd) { queue* elem, *tmp; - gbuint32 res = 6; /* nr of tags + next_ifd */ + uint32_t res = 6; /* nr of tags + next_ifd */ res += (ifd->count * 12); QUEUE_FOR_EACH(&ifd->tags, elem, tmp) { exif_tag_t* tag = (exif_tag_t*)elem; if (tag->size > 4) { - gbuint32 size = tag->size; + uint32_t size = tag->size; if (size & 1) { size++; } @@ -404,11 +404,11 @@ exif_load_apps(void) } static exif_ifd_t* -exif_read_ifd(exif_app_t* app, const gbuint16 ifd_nr, gbsize_t offs, - gbuint32* exif_ifd_ofs, gbuint32* gps_ifd_ofs, gbuint32* inter_ifd_ofs) +exif_read_ifd(exif_app_t* app, const uint16_t ifd_nr, gbsize_t offs, + uint32_t* exif_ifd_ofs, uint32_t* gps_ifd_ofs, uint32_t* inter_ifd_ofs) { queue* elem, *tmp; - gbuint16 i; + uint16_t i; exif_ifd_t* ifd; gbfile* fin = app->fexif; @@ -493,7 +493,7 @@ exif_read_ifd(exif_app_t* app, const gbuint16 ifd_nr, gbsize_t offs, QUEUE_FOR_EACH(&ifd->tags, elem, tmp) { exif_tag_t* tag = (exif_tag_t*)elem; if ((tag->size > 4) && (tag->value)) { - gbuint16 i; + uint16_t i; char* ptr; tag->data = xmalloc(tag->size); @@ -508,17 +508,17 @@ exif_read_ifd(exif_app_t* app, const gbuint16 ifd_nr, gbsize_t offs, switch (tag->type) { case EXIF_TYPE_SHORT: case EXIF_TYPE_SSHORT: - *(gbint16*)ptr = gbfgetuint16(fin); + *(int16_t*)ptr = gbfgetuint16(fin); break; case EXIF_TYPE_IFD: case EXIF_TYPE_LONG: case EXIF_TYPE_SLONG: - *(gbint32*)ptr = gbfgetuint32(fin); + *(int32_t*)ptr = gbfgetuint32(fin); break; case EXIF_TYPE_RAT: case EXIF_TYPE_SRAT: - *(gbint32*)ptr = gbfgetuint32(fin); - *(gbint32*)(ptr+4) = gbfgetuint32(fin); + *(int32_t*)ptr = gbfgetuint32(fin); + *(int32_t*)(ptr+4) = gbfgetuint32(fin); break; case EXIF_TYPE_FLOAT: *(float*)ptr = gbfgetflt(fin); @@ -550,7 +550,7 @@ static void exif_read_app(exif_app_t* app) { gbsize_t offs; - gbuint32 exif_ifd_ofs, gps_ifd_ofs, inter_ifd_ofs; + uint32_t exif_ifd_ofs, gps_ifd_ofs, inter_ifd_ofs; exif_ifd_t* ifd; gbfile* fin = app->fexif; @@ -586,8 +586,8 @@ exif_read_app(exif_app_t* app) static void exif_examine_app(exif_app_t* app) { - gbuint16 endianess; - gbuint32 ident; + uint16_t endianess; + uint32_t ident; gbfile* ftmp = exif_app->fcache; int i; @@ -617,7 +617,7 @@ exif_examine_app(exif_app_t* app) } static exif_ifd_t* -exif_find_ifd(exif_app_t* app, const gbuint16 ifd_nr) +exif_find_ifd(exif_app_t* app, const uint16_t ifd_nr) { queue* e0, *t0; @@ -632,7 +632,7 @@ exif_find_ifd(exif_app_t* app, const gbuint16 ifd_nr) } static exif_tag_t* -exif_find_tag(exif_app_t* app, const gbuint16 ifd_nr, const gbuint16 tag_id) +exif_find_tag(exif_app_t* app, const uint16_t ifd_nr, const uint16_t tag_id) { exif_ifd_t* ifd = exif_find_ifd(app, ifd_nr); if (ifd != NULL) { @@ -869,7 +869,7 @@ exif_waypt_from_exif_app(exif_app_t* app) str = xstrndup((char*)tag->data + 8, tag->size - 8); } else if (memcmp(tag->data, "UNICODE\0", 8) == 0) { int i, len = (tag->size - 8) / 2; - gbint16* s = (gbint16*)((char*)tag->data + 8); + int16_t* s = (int16_t*)((char*)tag->data + 8); for (i = 0; i < len; i++) { s[i] = be_read16(&s[i]); /* always BE ? */ } @@ -909,7 +909,7 @@ exif_waypt_from_exif_app(exif_app_t* app) } static void -exif_dec2frac(double val, gbint32* num, gbint32* den) +exif_dec2frac(double val, int32_t* num, int32_t* den) { char sval[16], snum[16]; char dot = 0; @@ -972,11 +972,11 @@ exif_dec2frac(double val, gbint32* num, gbint32* den) } static exif_tag_t* -exif_put_value(const int ifd_nr, const gbuint16 tag_id, const gbuint16 type, const gbuint32 count, const int index, const void* data) +exif_put_value(const int ifd_nr, const uint16_t tag_id, const uint16_t type, const uint32_t count, const int index, const void* data) { exif_tag_t* tag = NULL; exif_ifd_t* ifd; - gbuint16 item_size, size; + uint16_t item_size, size; ifd = exif_find_ifd(exif_app, ifd_nr); if (ifd == NULL) { @@ -1035,13 +1035,13 @@ exif_put_value(const int ifd_nr, const gbuint16 tag_id, const gbuint16 type, con case EXIF_TYPE_RAT: case EXIF_TYPE_SRAT: { double val = *(double*)data; - gbuint32* dest = (gbuint32*) tag->data; + uint32_t* dest = (uint32_t*) tag->data; if ((int)val == val) { dest[index * 2] = (int)val; dest[(index * 2) + 1] = 1; } else { - gbint32 Nom, Den; + int32_t Nom, Den; exif_dec2frac(val, &Nom, &Den); if ((type == EXIF_TYPE_SRAT) && (val < 0.0)) { Nom *= -1; @@ -1092,7 +1092,7 @@ exif_put_coord(const int ifd_nr, const int tag_id, const double val) } static void -exif_put_long(const int ifd_nr, const int tag_id, const int index, const gbint32 val) +exif_put_long(const int ifd_nr, const int tag_id, const int index, const int32_t val) { exif_put_value(ifd_nr, tag_id, EXIF_TYPE_LONG, 1, index, &val); } @@ -1157,10 +1157,10 @@ exif_write_value(exif_tag_t* tag, gbfile* fout) if BYTE_TYPE(tag->type) { gbfwrite(data, 4, 1, fout); } else if WORD_TYPE(tag->type) { - gbfputuint16(*(gbuint16*)data, fout); - gbfputuint16(*(gbuint16*)(data+2), fout); + gbfputuint16(*(uint16_t*)data, fout); + gbfputuint16(*(uint16_t*)(data+2), fout); } else if LONG_TYPE(tag->type) { - gbfputuint32(*(gbuint32*)data, fout); + gbfputuint32(*(uint32_t*)data, fout); } else if (tag->type == EXIF_TYPE_FLOAT) { gbfputflt(*(float*)data, fout); } else { @@ -1206,7 +1206,7 @@ exif_write_ifd(const exif_ifd_t* ifd, const char next, gbfile* fout) exif_tag_t* tag = (exif_tag_t*)elem; if (tag->size > 4) { - gbuint16 i; + uint16_t i; char* ptr = (char*) tag->data; if BYTE_TYPE(tag->type) { @@ -1215,17 +1215,17 @@ exif_write_ifd(const exif_ifd_t* ifd, const char next, gbfile* fout) switch (tag->type) { case EXIF_TYPE_SHORT: case EXIF_TYPE_SSHORT: - gbfputuint16(*(gbint16*)ptr, fout); + gbfputuint16(*(int16_t*)ptr, fout); break; case EXIF_TYPE_LONG: case EXIF_TYPE_SLONG: case EXIF_TYPE_IFD: - gbfputuint32(*(gbint32*)ptr, fout); + gbfputuint32(*(int32_t*)ptr, fout); break; case EXIF_TYPE_RAT: case EXIF_TYPE_SRAT: - gbfputuint32(*(gbint32*)ptr, fout); - gbfputuint32(*(gbint32*)(ptr+4), fout); + gbfputuint32(*(int32_t*)ptr, fout); + gbfputuint32(*(int32_t*)(ptr+4), fout); break; case EXIF_TYPE_FLOAT: gbfputflt(*(float*)ptr, fout); @@ -1260,7 +1260,7 @@ exif_write_apps(void) if (app == exif_app) { queue* e1, *t1; - gbuint16 len = 8; + uint16_t len = 8; gbfile* ftmp; exif_tag_t* tag; @@ -1362,7 +1362,7 @@ exif_rd_deinit(void) static void exif_read(void) { - gbuint16 soi; + uint16_t soi; waypoint* wpt; soi = gbfgetuint16(fin); @@ -1381,7 +1381,7 @@ exif_read(void) static void exif_wr_init(const char* fname) { - gbuint16 soi; + uint16_t soi; char* tmpname; exif_success = 0; @@ -1489,7 +1489,7 @@ exif_write(void) exif_remove_tag(GPS_IFD, GPS_IFD_TAG_ALT); exif_remove_tag(GPS_IFD, GPS_IFD_TAG_ALTREF); } else { - gbuint8 alt_ref; + uint8_t alt_ref; if (wpt->altitude >= 0.0) { alt_ref = 0; } else { diff --git a/gpsbabel/g7towin.cc b/gpsbabel/g7towin.cc index cf48069af..01292f6ad 100644 --- a/gpsbabel/g7towin.cc +++ b/gpsbabel/g7towin.cc @@ -370,7 +370,7 @@ parse_categories(char* buff) int cat = 0; while ((cin = csv_lineparse(buff, ",", "", cat++))) { - gbuint16 cx; + uint16_t cx; buff = NULL; diff --git a/gpsbabel/garmin_fit.cc b/gpsbabel/garmin_fit.cc index 4e72886f8..483c8a095 100644 --- a/gpsbabel/garmin_fit.cc +++ b/gpsbabel/garmin_fit.cc @@ -49,7 +49,7 @@ static struct { int len; int endian; route_head* track; - gbuint32 last_timestamp; + uint32_t last_timestamp; fit_message_def message_def[16]; } fit_data; @@ -120,7 +120,7 @@ fit_parse_header(void) } } -static gbuint8 +static uint8_t fit_getuint8(void) { int val; @@ -139,11 +139,11 @@ fit_getuint8(void) fatal(MYNAME ": unexpected end of file with fit_data.len=%d\n",fit_data.len); } fit_data.len--; - return (gbuint8)val; + return (uint8_t)val; } -static gbuint16 +static uint16_t fit_getuint16(void) { char buf[2]; @@ -162,7 +162,7 @@ fit_getuint16(void) } -static gbuint32 +static uint32_t fit_getuint32(void) { char buf[4]; @@ -182,7 +182,7 @@ fit_getuint32(void) } static void -fit_parse_definition_message(gbuint8 header) +fit_parse_definition_message(uint8_t header) { int local_id = header & 0x1f; fit_message_def* def = &fit_data.message_def[local_id]; @@ -229,7 +229,7 @@ fit_parse_definition_message(gbuint8 header) } } -static gbuint32 +static uint32_t fit_read_field(fit_field_t* f) { int i; @@ -266,16 +266,16 @@ static void fit_parse_data(fit_message_def* def, int time_offset) { fit_field_t* f; - gbuint32 timestamp = fit_data.last_timestamp + time_offset; - gbuint32 val; - gbint32 lat = 0x7fffffff; - gbint32 lon = 0x7fffffff; - gbuint16 alt = 0xffff; - gbuint16 speed = 0xffff; - gbuint8 heartrate = 0xff; - gbuint8 cadence = 0xff; - gbuint16 power = 0xffff; - gbint8 temperature = 0x7f; + uint32_t timestamp = fit_data.last_timestamp + time_offset; + uint32_t val; + int32_t lat = 0x7fffffff; + int32_t lon = 0x7fffffff; + uint16_t alt = 0xffff; + uint16_t speed = 0xffff; + uint8_t heartrate = 0xff; + uint8_t cadence = 0xff; + uint16_t power = 0xffff; + int8_t temperature = 0x7f; int i; waypoint* waypt; @@ -398,7 +398,7 @@ fit_parse_data(fit_message_def* def, int time_offset) } static void -fit_parse_data_message(gbuint8 header) +fit_parse_data_message(uint8_t header) { int local_id = header & 0x1f; fit_message_def* def = &fit_data.message_def[local_id]; @@ -406,7 +406,7 @@ fit_parse_data_message(gbuint8 header) } static void -fit_parse_compressed_message(gbuint8 header) +fit_parse_compressed_message(uint8_t header) { int local_id = (header >> 5) & 3; fit_message_def* def = &fit_data.message_def[local_id]; @@ -419,7 +419,7 @@ fit_parse_compressed_message(gbuint8 header) static void fit_parse_record(void) { - gbuint8 header; + uint8_t header; header = fit_getuint8(); // high bit 7 set -> compressed message (0 for normal) diff --git a/gpsbabel/garmin_fs.cc b/gpsbabel/garmin_fs.cc index 2bae8c51c..230918e62 100644 --- a/gpsbabel/garmin_fs.cc +++ b/gpsbabel/garmin_fs.cc @@ -241,7 +241,7 @@ garmin_fs_xml_fprint(const waypoint* waypt, } if (gmsd->flags.category && gmsd->category) { int i; - gbuint16 cx = gmsd->category; + uint16_t cx = gmsd->category; writer.writeStartElement("gpxx:Categories"); for (i = 0; i < 16; i++) { if (cx & 1) { @@ -362,7 +362,7 @@ garmin_fs_xml_convert(const int base_tag, int tag, const char* cdatastr, waypoin } unsigned char -garmin_fs_convert_category(const char* category_name, gbuint16* category) +garmin_fs_convert_category(const char* category_name, uint16_t* category) { int i; int cat = 0; @@ -395,7 +395,7 @@ garmin_fs_convert_category(const char* category_name, gbuint16* category) unsigned char garmin_fs_merge_category(const char* category_name, waypoint* waypt) { - gbuint16 cat; + uint16_t cat; garmin_fs_t* gmsd; if (!garmin_fs_convert_category(category_name, &cat)) { diff --git a/gpsbabel/garmin_fs.h b/gpsbabel/garmin_fs.h index 95b4e8e5c..94d5bbad0 100644 --- a/gpsbabel/garmin_fs.h +++ b/gpsbabel/garmin_fs.h @@ -92,10 +92,10 @@ typedef struct garmin_fs_s { int protocol; /* ... used by device (-1 is MapSource) */ - gbint32 icon; + int32_t icon; int wpt_class; - gbint32 display; - gbint16 category; + int32_t display; + int16_t category; char* city; /* city name */ char* facility; /* facility name */ char* state; /* state */ @@ -128,7 +128,7 @@ void garmin_fs_xml_fprint(const waypoint* waypt, QXmlStreamWriter&); /* common garmin_fs utilities */ /* ..convert_category: returns 1=OK; 0=Unable to convert category */ -unsigned char garmin_fs_convert_category(const char* category_name, gbuint16* category); +unsigned char garmin_fs_convert_category(const char* category_name, uint16_t* category); /* ..merge_category: returns 1=OK; 0=Unable to convert category */ unsigned char garmin_fs_merge_category(const char* category_name, waypoint* waypt); diff --git a/gpsbabel/garmin_gpi.cc b/gpsbabel/garmin_gpi.cc index c2304236f..3bdf4f2da 100644 --- a/gpsbabel/garmin_gpi.cc +++ b/gpsbabel/garmin_gpi.cc @@ -155,36 +155,36 @@ typedef struct gpi_waypt_data_s { } gpi_waypt_data_t; typedef struct { - gbint32 size; - gbint16 res1; - gbint16 res2; - gbint32 image_offset; - gbint32 header_size; - gbint32 width; - gbint32 height; - gbint16 planes; - gbint16 bpp; - gbint32 compression_type; - gbint32 image_data_size; - gbint32 resolution_h; - gbint32 resolution_v; - gbint32 used_colors; - gbint32 important_colors; + int32_t size; + int16_t res1; + int16_t res2; + int32_t image_offset; + int32_t header_size; + int32_t width; + int32_t height; + int16_t planes; + int16_t bpp; + int32_t compression_type; + int32_t image_data_size; + int32_t resolution_h; + int32_t resolution_v; + int32_t used_colors; + int32_t important_colors; } bmp_header_t; typedef struct { - gbint16 index; - gbint16 height; - gbint16 width; - gbint16 line_sz; - gbint16 bpp; - gbint16 fixed_0; - gbint32 image_size; - gbint32 fixed_2c; - gbint32 flag1; - gbint32 tr_color; - gbint32 flag2; - gbint32 size_2c; + int16_t index; + int16_t height; + int16_t width; + int16_t line_sz; + int16_t bpp; + int16_t fixed_0; + int32_t image_size; + int32_t fixed_2c; + int32_t flag1; + int32_t tr_color; + int32_t flag2; + int32_t size_2c; } gpi_bitmap_header_t; typedef struct { @@ -201,7 +201,7 @@ typedef struct { } gpi_waypt_t; static gbfile* fin, *fout; -static gbint16 codepage; /* code-page, i.e. 1252 */ +static int16_t codepage; /* code-page, i.e. 1252 */ static reader_data_t* rdata; static writer_data_t* wdata; static short_handle short_h; @@ -1378,7 +1378,7 @@ load_bitmap_from_file(const char* fname, unsigned char** data, int* data_sz) for (j = 0; j < src_h.width; j++) { int color; - color = (gbint32)gbfgetint16(f) | (gbfgetc(f) << 16); + color = (int32_t)gbfgetint16(f) | (gbfgetc(f) << 16); le_write32(p, color); p += 4; } diff --git a/gpsbabel/garmin_tables.cc b/gpsbabel/garmin_tables.cc index fb3b7f131..855ebd682 100644 --- a/gpsbabel/garmin_tables.cc +++ b/gpsbabel/garmin_tables.cc @@ -645,7 +645,7 @@ static datum_mapping_t gt_mps_datum_names[] = { typedef struct garmin_color_s { const char* name; - gbint32 rgb; + int32_t rgb; } garmin_color_t; static garmin_color_t gt_colors[] = { @@ -1036,7 +1036,7 @@ gt_lookup_datum_index(const char* datum_str, const char* module) return result; } -gbuint32 +uint32_t gt_color_value(const unsigned int garmin_index) { if ((garmin_index < GT_COLORS_CT)) { @@ -1046,7 +1046,7 @@ gt_color_value(const unsigned int garmin_index) } } -gbuint32 +uint32_t gt_color_value_by_name(const char* name) { unsigned int i; diff --git a/gpsbabel/garmin_tables.h b/gpsbabel/garmin_tables.h index ce290e6fc..08f21e492 100644 --- a/gpsbabel/garmin_tables.h +++ b/gpsbabel/garmin_tables.h @@ -95,8 +95,8 @@ grid_type gt_lookup_grid_type(const char* grid_name, const char* module); const char* gt_get_mps_grid_longname(const grid_type grid, const char* module); int gt_lookup_datum_index(const char* datum_str, const char* module); const char* gt_get_mps_datum_name(const int datum_index); -gbuint32 gt_color_value(const unsigned int garmin_index); -gbuint32 gt_color_value_by_name(const char* name); +uint32_t gt_color_value(const unsigned int garmin_index); +uint32_t gt_color_value_by_name(const char* name); int gt_color_index_by_name(const char* name); int gt_color_index_by_rgb(const int rgb); const char* gt_color_name(const unsigned int garmin_index); diff --git a/gpsbabel/garmin_txt.cc b/gpsbabel/garmin_txt.cc index 01e6bfd53..3a959a197 100644 --- a/gpsbabel/garmin_txt.cc +++ b/gpsbabel/garmin_txt.cc @@ -385,7 +385,7 @@ print_date_and_time(const time_t time, const int time_only) } static void -print_categories(gbuint16 categories) +print_categories(uint16_t categories) { int i, count; char* c; @@ -925,12 +925,12 @@ parse_date_and_time(char* str, time_t* value) return 1; } -static gbuint16 +static uint16_t parse_categories(const char* str) { char buff[256]; - gbuint16 val; - gbuint16 res = 0; + uint16_t val; + uint16_t res = 0; char* cin, *cx; if (*str == '\0') { diff --git a/gpsbabel/garmin_xt.cc b/gpsbabel/garmin_xt.cc index 6b07e95b4..2afb3d3d8 100644 --- a/gpsbabel/garmin_xt.cc +++ b/gpsbabel/garmin_xt.cc @@ -83,13 +83,13 @@ format_garmin_xt_rd_deinit(void) gbfclose(fin); } -static gbuint16 -format_garmin_xt_rd_st_attrs(char* p_trk_name, gbuint8* p_track_color) +static uint16_t +format_garmin_xt_rd_st_attrs(char* p_trk_name, uint8_t* p_track_color) { int method = 0; - gbuint16 trackbytes = 0, TrackPoints = 0; - gbuint8 spam = 0; - gbint32 TrackMaxLat = 0, TrackMaxLon = 0, TrackMinLat = 0, TrackMinLon = 0; + uint16_t trackbytes = 0, TrackPoints = 0; + uint8_t spam = 0; + int32_t TrackMaxLat = 0, TrackMaxLon = 0, TrackMinLat = 0, TrackMinLon = 0; char trk_name[30]=""; // TODO: SHIFT - can't test behaviour, do not have appropriate files //int ii; @@ -150,9 +150,9 @@ format_garmin_xt_rd_st_attrs(char* p_trk_name, gbuint8* p_track_color) * Function to decrypt track block in saved read from saved tracks file */ static void -format_garmin_xt_decrypt_trk_blk(int Count, gbuint8 TrackBlock[]) +format_garmin_xt_decrypt_trk_blk(int Count, uint8_t TrackBlock[]) { - gbuint8 i,j = 12; + uint8_t i,j = 12; while (j<(Count-1)) { for (i = j; i < Count; i++) { TrackBlock[i] = TrackBlock[i] >> 1; @@ -168,11 +168,11 @@ format_garmin_xt_decrypt_trk_blk(int Count, gbuint8 TrackBlock[]) * Function to Decompose track block of STRK_BLOCK_SIZE bytes */ static void -format_garmin_xt_decomp_trk_blk(gbuint8 ii, gbuint8 TrackBlock[], double* Ele, double* Lat, double* Lon, gbuint32* Time) +format_garmin_xt_decomp_trk_blk(uint8_t ii, uint8_t TrackBlock[], double* Ele, double* Lat, double* Lon, uint32_t* Time) { - gbuint32 LatLW = 0, LonLW = 0, TimeLW = 0; + uint32_t LatLW = 0, LonLW = 0, TimeLW = 0; double LatF = 0, LonF = 0; - gbuint16 PrevEleW; + uint16_t PrevEleW; //printf("%d %d %d %d %d %d\n", TrackBlock[0], TrackBlock[1], TrackBlock[2], TrackBlock[3], TrackBlock[4], TrackBlock[5]); PrevEleW = TrackBlock[(ii - 1) * 12 + 1 ]; @@ -216,9 +216,9 @@ format_garmin_xt_decomp_trk_blk(gbuint8 ii, gbuint8 TrackBlock[], double* Ele, d * Decompose Last Waypoint Eleveation */ static void -format_garmin_xt_decomp_last_ele(gbuint8 ii, double* PrevEle, gbuint8 TrackBlock[]) +format_garmin_xt_decomp_last_ele(uint8_t ii, double* PrevEle, uint8_t TrackBlock[]) { - gbuint16 PrevEleW; + uint16_t PrevEleW; PrevEleW = TrackBlock[ii - 1]; PrevEleW = PrevEleW << 8; @@ -234,14 +234,14 @@ format_garmin_xt_proc_strk(void) { int Count = 0; // Used to obtain number of read bytes int NumberOfTracks = 0, TracksCompleted = 0; // Number of tracks in the file and number of processed tracks - gbuint16 trackbytes = 0; // Bytes in track - gbuint8 TrackBlock[STRK_BLOCK_SIZE]; // File Block - gbuint8 ii; // temp variable + uint16_t trackbytes = 0; // Bytes in track + uint8_t TrackBlock[STRK_BLOCK_SIZE]; // File Block + uint8_t ii; // temp variable double Lat = 0, Lon = 0; // wpt data double PrevLat = 0, PrevLon = 0, PrevEle = 0; // wpt data - gbuint32 Time = 0, PrevTime =0; // wpt data + uint32_t Time = 0, PrevTime =0; // wpt data int FirstCoo; - gbuint8 trk_color = 0xff; + uint8_t trk_color = 0xff; // Skip 12 bytes from the BOF gbfseek(fin, 12, SEEK_SET); @@ -337,14 +337,14 @@ format_garmin_xt_proc_strk(void) static void format_garmin_xt_proc_atrk(void) { - gbuint16 block=0, uu=0; - gbuint32 Lat=0, Lon=0; - gbuint32 Tim=0; + uint16_t block=0, uu=0; + uint32_t Lat=0, Lon=0; + uint32_t Tim=0; double LatF = 0, LonF = 0, AltF = 0; waypoint* wpt; int method = 0; unsigned char buf[3]; - gbint32 num_trackpoints; + int32_t num_trackpoints; // get the option for the processing the track name if (opt_trk_header) { diff --git a/gpsbabel/gbfile.cc b/gpsbabel/gbfile.cc index 32196b6e7..093967699 100644 --- a/gpsbabel/gbfile.cc +++ b/gpsbabel/gbfile.cc @@ -107,7 +107,7 @@ gzapi_close(gbfile* self) } static int -gzapi_seek(gbfile* self, gbint32 offset, int whence) +gzapi_seek(gbfile* self, int32_t offset, int whence) { int result; @@ -267,7 +267,7 @@ stdapi_close(gbfile* self) } static int -stdapi_seek(gbfile* self, gbint32 offset, int whence) +stdapi_seek(gbfile* self, int32_t offset, int whence) { int result; gbsize_t pos = 0; @@ -377,7 +377,7 @@ memapi_close(gbfile* self) } static int -memapi_seek(gbfile* self, gbint32 offset, int whence) +memapi_seek(gbfile* self, int32_t offset, int whence) { long long pos = (int)self->mempos; @@ -857,7 +857,7 @@ gbfrewind(gbfile* file) */ int -gbfseek(gbfile* file, gbint32 offset, int whence) +gbfseek(gbfile* file, int32_t offset, int whence) { return file->fileseek(file, offset, whence); } @@ -902,7 +902,7 @@ gbfungetc(const int c, gbfile* file) * gbfgetint32: read a signed 32-bit integer from input stream */ -gbint32 +int32_t gbfgetint32(gbfile* file) { char buf[4]; @@ -921,7 +921,7 @@ gbfgetint32(gbfile* file) * gbfgetint16: read a signed 16-bit integer from input stream */ -gbint16 +int16_t gbfgetint16(gbfile* file) { char buf[2]; @@ -1156,7 +1156,7 @@ gbfgetstr(gbfile* file) */ int -gbfputint16(const gbint16 i, gbfile* file) +gbfputint16(const int16_t i, gbfile* file) { char buf[2]; @@ -1173,7 +1173,7 @@ gbfputint16(const gbint16 i, gbfile* file) */ int -gbfputint32(const gbint32 i, gbfile* file) +gbfputint32(const int32_t i, gbfile* file) { char buf[4]; diff --git a/gpsbabel/gbfile.h b/gpsbabel/gbfile.h index 369e84fd0..e3651b9aa 100644 --- a/gpsbabel/gbfile.h +++ b/gpsbabel/gbfile.h @@ -33,6 +33,7 @@ struct gbfile_s; typedef struct gbfile_s gbfile; +typedef uint32_t gbsize_t; typedef void (*gbfclearerr_cb)(gbfile* self); typedef int (*gbfclose_cb)(gbfile* self); @@ -41,7 +42,7 @@ typedef int (*gbferror_cb)(gbfile* self); typedef int (*gbfflush_cb)(gbfile* self); typedef gbfile* (*gbfopen_cb)(gbfile* self, const char* mode); typedef gbsize_t (*gbfread_cb)(void* buf, const gbsize_t size, const gbsize_t members, gbfile* self); -typedef int (*gbfseek_cb)(gbfile* self, gbint32 offset, int whence); +typedef int (*gbfseek_cb)(gbfile* self, int32_t offset, int whence); typedef gbsize_t (*gbftell_cb)(gbfile* self); typedef gbsize_t (*gbfwrite_cb)(const void* buf, const gbsize_t size, const gbsize_t members, gbfile* self); typedef int (*gbfungetc_cb)(const int c, gbfile* self); @@ -107,25 +108,25 @@ int gbfflush(gbfile* file); void gbfclearerr(gbfile* file); int gbferror(gbfile* file); void gbfrewind(gbfile* file); -int gbfseek(gbfile* file, gbint32 offset, int whence); +int gbfseek(gbfile* file, int32_t offset, int whence); gbsize_t gbftell(gbfile* file); int gbfeof(gbfile* file); int gbfungetc(const int c, gbfile* file); -gbint32 gbfgetint32(gbfile* file); -#define gbfgetuint32 (gbuint32)gbfgetint32 -gbint16 gbfgetint16(gbfile* file); -#define gbfgetuint16 (gbuint16)gbfgetint16 +int32_t gbfgetint32(gbfile* file); +#define gbfgetuint32 (uint32_t)gbfgetint32 +int16_t gbfgetint16(gbfile* file); +#define gbfgetuint16 (uint16_t)gbfgetint16 double gbfgetdbl(gbfile* file); // read a double value float gbfgetflt(gbfile* file); // read a float value char* gbfgetstr(gbfile* file); // read until any type of line-breaks or EOF char* gbfgetpstr(gbfile* file); // read a pascal string char* gbfgetcstr(gbfile* file); // read a null terminated string -int gbfputint16(const gbint16 i, gbfile* file); -#define gbfputuint16(a,b) gbfputint16((gbuint16)(a),(b)) -int gbfputint32(const gbint32 i, gbfile* file); -#define gbfputuint32(a,b) gbfputint32((gbuint32)(a),(b)) +int gbfputint16(const int16_t i, gbfile* file); +#define gbfputuint16(a,b) gbfputint16((uint16_t)(a),(b)) +int gbfputint32(const int32_t i, gbfile* file); +#define gbfputuint32(a,b) gbfputint32((uint32_t)(a),(b)) int gbfputdbl(const double d, gbfile* file); // write a double value int gbfputflt(const float f, gbfile* file); // write a float value diff --git a/gpsbabel/gbtypes.h b/gpsbabel/gbtypes.h deleted file mode 100644 index 01b52b313..000000000 --- a/gpsbabel/gbtypes.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - Abstract fixed size data types. - - Copyright (C) 2005 Robert Lipe, robertlipe@usa.net - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA - - */ - -#ifndef gb_types_h_included -#define gb_types_h_included - -# if defined (__FreeBSD__) -# include -# else -# include -# endif - -typedef uint32_t gbuint32; -typedef uint16_t gbuint16; -typedef int32_t gbint32; -typedef int16_t gbint16; - -typedef gbuint32 gbsize_t; -typedef unsigned char gbuint8; -typedef signed char gbint8; - -#endif /* gb_types_h_included */ diff --git a/gpsbabel/ggv_log.cc b/gpsbabel/ggv_log.cc index 185f9b2d7..e8cfa33ad 100644 --- a/gpsbabel/ggv_log.cc +++ b/gpsbabel/ggv_log.cc @@ -126,13 +126,13 @@ ggv_log_read(void) wpt = waypt_new(); - deg = (gbint16) le_read16(&buf[0]); + deg = (int16_t) le_read16(&buf[0]); min = le_read16(&buf[2]); sec = le_read_float(&buf[4]); xlat = (double)deg + ((double)min / (double)60) + (sec / (double)3600.0); wpt->latitude = xlat; - deg = (gbint16) le_read16(&buf[8]); + deg = (int16_t) le_read16(&buf[8]); min = le_read16(&buf[10]); sec = le_read_float(&buf[12]); xlon = (double)deg + ((double)min / (double)60) + (sec / (double)3600.0); @@ -242,15 +242,15 @@ ggv_log_track_head_cb(const route_head* trk) secs = (double)tm.tm_sec + wpt->GetCreationTime().time().msec() / 1000.0; } - gbfputint16((gbint16) latint, fout); - gbfputint16((gbint16) latmin, fout); + gbfputint16((int16_t) latint, fout); + gbfputint16((int16_t) latmin, fout); gbfputflt(latsec, fout); - gbfputint16((gbint16) lonint, fout); - gbfputint16((gbint16) lonmin, fout); + gbfputint16((int16_t) lonint, fout); + gbfputint16((int16_t) lonmin, fout); gbfputflt(lonsec, fout); - gbfputint16((gbint16) course, fout); - gbfputint16((gbint16)(wpt->altitude != unknown_alt) ? wpt->altitude : 0, fout); - gbfputint16((gbint16) speed, fout); + gbfputint16((int16_t) course, fout); + gbfputint16((int16_t)(wpt->altitude != unknown_alt) ? wpt->altitude : 0, fout); + gbfputint16((int16_t) speed, fout); gbfputint16(0, fout); gbfputint16(tm.tm_year, fout); gbfputint16(tm.tm_mon, fout); diff --git a/gpsbabel/gnav_trl.cc b/gpsbabel/gnav_trl.cc index e15e6422d..5abbca378 100644 --- a/gpsbabel/gnav_trl.cc +++ b/gpsbabel/gnav_trl.cc @@ -31,10 +31,10 @@ arglist_t gnav_trl_args[] = { }; typedef struct gnav_trl_s { - gbuint32 time; + uint32_t time; float lat; float lon; - gbuint32 alt; + uint32_t alt; } gnav_trl_t; static gbfile* fin, *fout; diff --git a/gpsbabel/height.h b/gpsbabel/height.h index aa6fdba8d..c86f56c36 100644 --- a/gpsbabel/height.h +++ b/gpsbabel/height.h @@ -16,12 +16,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ -/* Created by "tools/createGeoidGrid 1.0 gbint8" using GeographicLib utility GeoidEval with egm96-5. */ +/* Created by "tools/createGeoidGrid 1.0 int8_t" using GeographicLib utility GeoidEval with egm96-5. */ #define GEOID_GRID_DEG 1.0 #define GEOID_SCALE 1.0 #define GEOID_ROW 181 #define GEOID_COL 361 -static const gbint8 geoid_delta[GEOID_COL*GEOID_ROW]= { +static const int8_t geoid_delta[GEOID_COL*GEOID_ROW]= { /* -180,-179,-178,-177,-176,-175,-174,-173,-172,-171,-170,-169,-168,-167,-166,-165,-164,-163,-162,-161,-160,-159,-158,-157,-156,-155,-154,-153,-152,-151,-150,-149,-148,-147,-146,-145,-144,-143,-142,-141,-140,-139,-138,-137,-136,-135,-134,-133,-132,-131,-130,-129,-128,-127,-126,-125,-124,-123,-122,-121,-120,-119,-118,-117,-116,-115,-114,-113,-112,-111,-110,-109,-108,-107,-106,-105,-104,-103,-102,-101,-100, -99, -98, -97, -96, -95, -94, -93, -92, -91, -90, -89, -88, -87, -86, -85, -84, -83, -82, -81, -80, -79, -78, -77, -76, -75, -74, -73, -72, -71, -70, -69, -68, -67, -66, -65, -64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53, -52, -51, -50, -49, -48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, -37, -36, -35, -34, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180 */ /* -90.0 */ -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, /* -89.0 */ -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, diff --git a/gpsbabel/html.cc b/gpsbabel/html.cc index 3459b17b7..9f1e8b79f 100644 --- a/gpsbabel/html.cc +++ b/gpsbabel/html.cc @@ -82,7 +82,7 @@ html_disp(const waypoint* wpt) char tbuf[1024]; char* cout; time_t tm = wpt->GetCreationTime(); - gbint32 utmz; + int32_t utmz; double utme, utmn; char utmzc; fs_xml* fs_gpx = NULL; diff --git a/gpsbabel/humminbird.cc b/gpsbabel/humminbird.cc index bc6fa67fe..d654ddade 100644 --- a/gpsbabel/humminbird.cc +++ b/gpsbabel/humminbird.cc @@ -35,8 +35,8 @@ /* I suspect that these are actually struct signature { - gbuint8 format, // 1 = track, 2 = waypoint, 3 = route - gbuint8 version, + uint8_t format, // 1 = track, 2 = waypoint, 3 = route + uint8_t version, gpuint16 record_length } @@ -60,79 +60,79 @@ Still, they're usful in the code as a plain signature. typedef struct humminbird_waypt_s { /* O.K.: the file can also contain routes with a different magic. */ - /* gbuint32 signature; */ /* Just for error checking(?) */ - gbuint16 num; /* Always ascending in the file. */ - gbuint16 zero; /* Always seems to be zero. */ - gbuint8 status; /* Always seems to be 1. Ends up as + /* uint32_t signature; */ /* Just for error checking(?) */ + uint16_t num; /* Always ascending in the file. */ + uint16_t zero; /* Always seems to be zero. */ + uint8_t status; /* Always seems to be 1. Ends up as in gpx files exported by HumminbirdPC. */ - gbuint8 icon; /* See below */ - gbuint16 depth; /* Water depth. These are fishfinders. In centimeters */ - gbuint32 time; /* This is a time_t. In UTC */ - gbint32 east; - gbint32 north; + uint8_t icon; /* See below */ + uint16_t depth; /* Water depth. These are fishfinders. In centimeters */ + uint32_t time; /* This is a time_t. In UTC */ + int32_t east; + int32_t north; char name[WPT_NAME_LEN]; } humminbird_waypt_t; typedef struct humminbird_rte_s { /* O.K.: the file can contain also routes with a different magic. */ - /* gbuint32 signature; */ /* Just for error checking(?) */ - gbuint16 num; - gbuint16 zero; - gbuint8 status; - gbuint8 U0; - gbuint8 U1; - gbint8 count; - gbuint32 time; + /* uint32_t signature; */ /* Just for error checking(?) */ + uint16_t num; + uint16_t zero; + uint8_t status; + uint8_t U0; + uint8_t U1; + int8_t count; + uint32_t time; char name[RTE_NAME_LEN]; - gbuint16 points[MAX_RTE_POINTS]; + uint16_t points[MAX_RTE_POINTS]; } humminbird_rte_t; typedef struct humminbird_trk_header_s { /* 68 bytes, incl signature */ - /* gbuint32 signature; */ - gbuint16 trk_num; - gbuint16 zero; - gbuint16 num_points; - gbuint16 unknown; /* Always zero so far. */ - gbuint32 time; /* a time_t, in UTC */ - - gbint32 start_east; /* Start of track */ - gbint32 start_north; - gbint32 end_east; /* end of track */ - gbint32 end_north; - - gbint32 sw_east; /* Bounding box, enclosing the track */ - gbint32 sw_north; /* sw is the south-west point */ - gbint32 ne_east; /* ne is the north-east point */ - gbint32 ne_north; + /* uint32_t signature; */ + uint16_t trk_num; + uint16_t zero; + uint16_t num_points; + uint16_t unknown; /* Always zero so far. */ + uint32_t time; /* a time_t, in UTC */ + + int32_t start_east; /* Start of track */ + int32_t start_north; + int32_t end_east; /* end of track */ + int32_t end_north; + + int32_t sw_east; /* Bounding box, enclosing the track */ + int32_t sw_north; /* sw is the south-west point */ + int32_t ne_east; /* ne is the north-east point */ + int32_t ne_north; char name[20]; } humminbird_trk_header_t; typedef struct humminbird_trk_point_s { - gbint16 deltaeast; - gbint16 deltanorth; - gbuint16 depth; /* in centimeters */ + int16_t deltaeast; + int16_t deltanorth; + uint16_t depth; /* in centimeters */ } humminbird_trk_point_t; typedef struct humminbird_trk_header_old_s { /* 16 bytes, incl signature */ - /* gbuint32 signature; */ - gbuint16 trk_num; - gbuint16 zero; - gbuint16 num_points; - gbuint16 unknown; /* Always zero so far. */ - gbuint32 time; /* a time_t, in UTC */ - - gbint32 start_east; /* Start of track */ - gbint32 start_north; - gbint32 end_east; /* end of track */ - gbint32 end_north; + /* uint32_t signature; */ + uint16_t trk_num; + uint16_t zero; + uint16_t num_points; + uint16_t unknown; /* Always zero so far. */ + uint32_t time; /* a time_t, in UTC */ + + int32_t start_east; /* Start of track */ + int32_t start_north; + int32_t end_east; /* end of track */ + int32_t end_north; } humminbird_trk_header_old_t; typedef struct humminbird_trk_point_old_s { - gbint16 deltaeast; - gbint16 deltanorth; + int16_t deltaeast; + int16_t deltanorth; } humminbird_trk_point_old_t; static const char* humminbird_icons[] = { @@ -340,8 +340,8 @@ humminbird_read_track(gbfile* fin) waypoint* first_wpt; int i; int max_points = 0; - gbint32 accum_east; - gbint32 accum_north; + int32_t accum_east; + int32_t accum_north; double g_lat; if (! gbfread(&th, 1, sizeof(th), fin)) { @@ -362,7 +362,7 @@ humminbird_read_track(gbfile* fin) th.ne_east = be_read32(&th.ne_east); th.ne_north = be_read32(&th.ne_north); - max_points = (131080 - sizeof(gbuint32) - sizeof(th)) / sizeof(humminbird_trk_point_t); + max_points = (131080 - sizeof(uint32_t) - sizeof(th)) / sizeof(humminbird_trk_point_t); if (th.num_points > max_points) { fatal(MYNAME ": Too many track points! (%d)\n", th.num_points); @@ -397,7 +397,7 @@ humminbird_read_track(gbfile* fin) for (i=0 ; i max_points) { fatal(MYNAME ": Too many track points! (%d)\n", th.num_points); @@ -516,7 +516,7 @@ humminbird_read_track_old(gbfile* fin) for (i=0 ; i 0x80000000) { sign = -1.0; @@ -226,10 +226,10 @@ deg_min_to_deg(volatile gbuint32 x) /* Convert degrees to the degrees format of itracku. */ -gbuint32 +uint32_t deg_to_deg_min(double x) { - gbint32 sign; + int32_t sign; double d; double f; @@ -248,8 +248,8 @@ deg_to_deg_min(double x) f = x - d; return - (gbuint32)d * 1000000 + // multiply integer degrees to shift it to the right digits. - (gbuint32)(f * 600000.0) + // multiply fractional part to convert to minutes and to to shift it to the right digits. + (uint32_t)d * 1000000 + // multiply integer degrees to shift it to the right digits. + (uint32_t)(f * 600000.0) + // multiply fractional part to convert to minutes and to to shift it to the right digits. ((sign > 0) ? 0 : 0x80000000); // add 0x80000000 for negative degrees } @@ -257,7 +257,7 @@ deg_to_deg_min(double x) Convert the itracku time format to time_t. */ static time_t -decode_itracku_time(gbuint32 date) +decode_itracku_time(uint32_t date) { struct tm t; t.tm_sec = date & 63; @@ -272,7 +272,7 @@ decode_itracku_time(gbuint32 date) /* Convert time_t to the itracku time format. */ -static gbuint32 +static uint32_t encode_itracku_time(time_t time) { struct tm* t = gmtime(&time); @@ -485,7 +485,7 @@ import_data_record(itracku_data_record* d) result = 0; } else { if (fbackup) { - if ((gbuint32)le_read32(d->creation_time) > backup_last_creation_time) { + if ((uint32_t)le_read32(d->creation_time) > backup_last_creation_time) { backup_last_creation_time = le_read32(d->creation_time); gbfwrite(d, sizeof(*d), 1, fbackup); result = -1; @@ -533,7 +533,7 @@ itracku_file_read_data_record(gbfile* fin, itracku_data_record* d) gbfread(d, sizeof(*d), 1, fin); } -static gbuint32 +static uint32_t itracku_file_read_last_time(gbfile* fin) { itracku_data_record d; @@ -545,7 +545,7 @@ itracku_file_read_last_time(gbfile* fin) } gbfseek(fin, -(int)s, SEEK_END); itracku_file_read_data_record(fin, &d); - return (gbuint32) le_read32(d.creation_time); + return (uint32_t) le_read32(d.creation_time); } static void diff --git a/gpsbabel/jeeps/gpsport.h b/gpsbabel/jeeps/gpsport.h index dd23cc401..3fac996ee 100644 --- a/gpsbabel/jeeps/gpsport.h +++ b/gpsbabel/jeeps/gpsport.h @@ -8,8 +8,8 @@ */ typedef unsigned char UC; -typedef gbuint16 US; -typedef gbuint16 uint16; -typedef gbint16 int16; -typedef gbuint32 uint32; -typedef gbint32 int32; +typedef uint16_t US; +typedef uint16_t uint16; +typedef int16_t int16; +typedef uint32_t uint32; +typedef int32_t int32; diff --git a/gpsbabel/mapsend.cc b/gpsbabel/mapsend.cc index d6a4b8a51..426bf72da 100644 --- a/gpsbabel/mapsend.cc +++ b/gpsbabel/mapsend.cc @@ -473,7 +473,7 @@ void mapsend_track_hdr(const route_head* trk) void mapsend_track_disp(const waypoint* wpt) { unsigned char c; - gbint32 t; + int32_t t; static int last_time; /* diff --git a/gpsbabel/mmo.cc b/gpsbabel/mmo.cc index 7ebb89d8b..af77316cd 100644 --- a/gpsbabel/mmo.cc +++ b/gpsbabel/mmo.cc @@ -94,14 +94,14 @@ static gbfile* fin, *fout; static int mmo_version; static int mmo_obj_ct; static int mmo_object_id; -static gbuint32 mmo_filemark; -static gbuint16 wpt_object_id; -static gbuint16 rte_object_id; -static gbuint16 trk_object_id; -static gbuint16 cat_object_id; -static gbuint16 ico_object_id; -static gbuint16 pos_object_id; -static gbuint16 txt_object_id; +static uint32_t mmo_filemark; +static uint16_t wpt_object_id; +static uint16_t rte_object_id; +static uint16_t trk_object_id; +static uint16_t cat_object_id; +static uint16_t ico_object_id; +static uint16_t pos_object_id; +static uint16_t txt_object_id; static gpsdata_type mmo_datatype; static route_head* mmo_rte; @@ -144,11 +144,11 @@ static const mmo_icon_mapping_t mmo_icon_value_table[] = { { -1, NULL } }; -static const gbuint32 obj_type_ico = 0x00; -static const gbuint32 obj_type_rte = 0x14; -static const gbuint32 obj_type_trk = 0x1E; -static const gbuint32 obj_type_txt = 0x32; -static const gbuint32 obj_type_wpt = 0x3C; +static const uint32_t obj_type_ico = 0x00; +static const uint32_t obj_type_rte = 0x14; +static const uint32_t obj_type_trk = 0x1E; +static const uint32_t obj_type_txt = 0x32; +static const uint32_t obj_type_wpt = 0x3C; /* helpers */ @@ -302,7 +302,7 @@ mmo_get_objid(const void* ptr) static mmo_data_t* -mmo_get_object(const gbuint16 objid) +mmo_get_object(const uint16_t objid) { char key[16]; mmo_data_t* data; @@ -427,7 +427,7 @@ mmo_read_CObjIcons(mmo_data_t* data) const char* sobj = "CObjIcons"; #endif int icon_id; - gbuint16 u16; + uint16_t u16; DBG((sobj, ":-----------------------------------------------------\n")); DBG((sobj, "name = \"%s\" [ visible=%s, id=0x%04X ]\n", @@ -495,7 +495,7 @@ mmo_read_CObjWaypoint(mmo_data_t* data) } if (mmo_version >= 0x18) { - gbuint16 u16; + uint16_t u16; u16 = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16)); u16 = gbfgetuint16(fin); @@ -625,7 +625,7 @@ mmo_read_CObjRoute(mmo_data_t* data) route_add_head(rte); if (mmo_version >= 0x18) { - gbuint16 u16; + uint16_t u16; u16 = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16)); u16 = gbfgetuint16(fin); @@ -700,7 +700,7 @@ mmo_read_CObjTrack(mmo_data_t* data) track_add_head(trk); if (mmo_version >= 0x18) { - gbuint16 u16; + uint16_t u16; u16 = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16)); u16 = gbfgetuint16(fin); @@ -730,11 +730,11 @@ mmo_read_CObjTrack(mmo_data_t* data) wpt->altitude = gbfgetflt(fin); if (unk != 0) { - gbuint16 ux; + uint16_t ux; ux = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (%d)\n", ux, ux)); if (unk > 1) { - gbuint16 ux; + uint16_t ux; ux = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (%d)\n", ux, ux)); } @@ -743,7 +743,7 @@ mmo_read_CObjTrack(mmo_data_t* data) } if (mmo_version > 0) { - gbuint32 u32; + uint32_t u32; u32 = gbfgetuint32(fin); /* Min. update interval */ DBG((sobj, "min. update interval = %d\n", u32)); @@ -776,7 +776,7 @@ mmo_read_CObjTrack(mmo_data_t* data) trk->line_color.opacity = 255 - (u8 * 51); if (mmo_version >= 0x16) { - gbuint16 u16; + uint16_t u16; char* text; // XXX ARB was u8 = gbfgetc(fin); but actually a string @@ -882,7 +882,7 @@ mmo_read_object(void) objid = gbfgetuint16(fin); if (objid == 0xFFFF) { - gbuint16 version; + uint16_t version; char* sobj; int len; DBG(("mmo_read_object", "Registering new object type\n")); @@ -926,7 +926,7 @@ mmo_read_object(void) data->name = mmo_readstr(); if (objid != cat_object_id) { - gbuint32 obj_type; + uint32_t obj_type; data->ctime = gbfgetuint32(fin); data->mtime = gbfgetuint32(fin); data->locked = gbfgetc(fin); @@ -934,7 +934,7 @@ mmo_read_object(void) obj_type = gbfgetuint32(fin); #ifdef MMO_DBG - gbuint32 expected_type = 0xFFFFFFFF; + uint32_t expected_type = 0xFFFFFFFF; if (objid == ico_object_id) { expected_type = obj_type_ico; } else if (objid == trk_object_id) { @@ -1196,7 +1196,7 @@ static int mmo_write_obj_mark(const char* sobj, const char* name) { char* key; - gbuint16 nr; + uint16_t nr; char buf[16]; int res; @@ -1229,7 +1229,7 @@ static void mmo_write_category(const char* sobj, const char* name) { char* key; - gbuint16 nr; + uint16_t nr; if (avltree_find(category_names, name, (const void**)&key)) { nr = (unsigned)atoi(key); @@ -1243,7 +1243,7 @@ mmo_write_category(const char* sobj, const char* name) static int mmo_write_obj_head(const char* sobj, const char* name, const time_t ctime, - const gbuint32 obj_type) + const uint32_t obj_type) { int res; diff --git a/gpsbabel/msroute.cc b/gpsbabel/msroute.cc index 6c5cbd590..8fb9f3366 100644 --- a/gpsbabel/msroute.cc +++ b/gpsbabel/msroute.cc @@ -37,23 +37,23 @@ static arglist_t msroute_args[] = { /* MS-AutoRoute structures */ typedef struct msroute_head_s { - gbuint32 U1; /* 58/02/00/00 */ + uint32_t U1; /* 58/02/00/00 */ char masm[4]; /* "MASM " */ - gbuint32 U2; - gbuint32 U3; - gbint32 waypts; - gbuint32 U5; - gbuint32 U6; - gbuint32 U7; - gbuint32 U8; - gbuint32 U9; - gbuint32 U10; - gbuint32 U11; - gbuint32 U12; - gbuint32 U13; - gbuint32 U14; - gbuint32 U15; - gbuint32 U16; + uint32_t U2; + uint32_t U3; + int32_t waypts; + uint32_t U5; + uint32_t U6; + uint32_t U7; + uint32_t U8; + uint32_t U9; + uint32_t U10; + uint32_t U11; + uint32_t U12; + uint32_t U13; + uint32_t U14; + uint32_t U15; + uint32_t U16; // short U17; // char U18; } msroute_head_t; @@ -85,45 +85,45 @@ static const unsigned char ole_magic[8] = { typedef struct ole_head_s { char magic[8]; char clsid[16]; - gbuint16 rev; /* offset 0x18 */ - gbuint16 ver; /* offset 0x1a */ - gbint16 byte_order; /* offset 0x1c */ - gbuint16 fat1_size_shift; /* offset 0x1e */ - gbuint16 fat2_size_shift; /* offset 0x20 */ - gbuint16 U7; /* offset 0x22 */ - gbuint32 U8; /* offset 0x24 */ - gbuint32 U9; /* offset 0x28 */ - gbint32 fat1_blocks; /* offset 0x2c */ - gbint32 prop_start; /* offset 0x30 */ - gbuint32 U12; /* offset 0x34 */ - gbuint32 fat1_min_size; /* offset 0x38 */ - gbint32 fat2_start; /* offset 0x3c */ - gbint32 fat2_blocks; /* offset 0x40 */ - gbint32 fat1_extra_start; /* offset 0x44 */ - gbint32 fat1_extra_ct; /* offset 0x48 */ - gbint32 fat1[OLE_HEAD_FAT1_CT]; /* offset 0x4c */ + uint16_t rev; /* offset 0x18 */ + uint16_t ver; /* offset 0x1a */ + int16_t byte_order; /* offset 0x1c */ + uint16_t fat1_size_shift; /* offset 0x1e */ + uint16_t fat2_size_shift; /* offset 0x20 */ + uint16_t U7; /* offset 0x22 */ + uint32_t U8; /* offset 0x24 */ + uint32_t U9; /* offset 0x28 */ + int32_t fat1_blocks; /* offset 0x2c */ + int32_t prop_start; /* offset 0x30 */ + uint32_t U12; /* offset 0x34 */ + uint32_t fat1_min_size; /* offset 0x38 */ + int32_t fat2_start; /* offset 0x3c */ + int32_t fat2_blocks; /* offset 0x40 */ + int32_t fat1_extra_start; /* offset 0x44 */ + int32_t fat1_extra_ct; /* offset 0x48 */ + int32_t fat1[OLE_HEAD_FAT1_CT]; /* offset 0x4c */ } ole_head_t; typedef struct ole_prop_s { - gbuint16 name[32]; - gbuint16 name_sz; /* offset 0x40 */ + uint16_t name[32]; + uint16_t name_sz; /* offset 0x40 */ char ole_typ; /* offset 0x42 */ char U1; /* offset 0x43 */ - gbuint32 previous; /* offset 0x44 */ - gbuint32 next; /* offset 0x48 */ - gbuint32 dir; /* offset 0x4c */ - gbuint32 U5; /* offset 0x50 */ - gbuint32 U6; /* offset 0x54 */ - gbuint32 U7; /* offset 0x58 */ - gbuint32 U8; /* offset 0x5c */ - gbuint32 U9; /* offset 0x60 */ - gbuint32 U10; /* offset 0x64 */ - gbuint32 U11; /* offset 0x68 */ - gbuint32 U12; /* offset 0x6c */ - gbuint32 U13; /* offset 0x70 */ - gbint32 first_sector; /* offset 0x74 */ - gbint32 data_sz; /* offset 0x78 */ - gbuint32 U16; /* offset 0x7c */ + uint32_t previous; /* offset 0x44 */ + uint32_t next; /* offset 0x48 */ + uint32_t dir; /* offset 0x4c */ + uint32_t U5; /* offset 0x50 */ + uint32_t U6; /* offset 0x54 */ + uint32_t U7; /* offset 0x58 */ + uint32_t U8; /* offset 0x5c */ + uint32_t U9; /* offset 0x60 */ + uint32_t U10; /* offset 0x64 */ + uint32_t U11; /* offset 0x68 */ + uint32_t U12; /* offset 0x6c */ + uint32_t U13; /* offset 0x70 */ + int32_t first_sector; /* offset 0x74 */ + int32_t data_sz; /* offset 0x78 */ + uint32_t U16; /* offset 0x7c */ } ole_prop_t; #define DIR_ITEM_SIZE sizeof(ole_prop_t) @@ -137,8 +137,8 @@ static int sector_sz = 512; #define max(a,b) ((a) > (b)) ? (a) : (b) #endif -static gbint32* ole_fat1 = NULL; -static gbint32* ole_fat2 = NULL; +static int32_t* ole_fat1 = NULL; +static int32_t* ole_fat2 = NULL; static int ole_fat1_ct; static int ole_fat2_ct; static int ole_size1; @@ -413,12 +413,12 @@ ole_init(void) #else is_fatal((ole_size1 != 512), MYNAME ": Unsupported sector size %d", ole_size1); #endif - ole_fat1 = (gbint32*) xmalloc(head.fat1_blocks * sector_sz); - ole_fat1_ct = (head.fat1_blocks * sector_sz) / sizeof(gbint32); + ole_fat1 = (int32_t*) xmalloc(head.fat1_blocks * sector_sz); + ole_fat1_ct = (head.fat1_blocks * sector_sz) / sizeof(int32_t); #ifdef OLE_DEBUG printf(MYNAME "-big fat: %d maximum sectors, size in memory %d, max. datasize %d bytes\n", - ole_fat1_ct, head.fat1_blocks * sector_sz, head.fat1_blocks * sector_sz * sector_sz / sizeof(gbint32)); + ole_fat1_ct, head.fat1_blocks * sector_sz, head.fat1_blocks * sector_sz * sector_sz / sizeof(int32_t)); #endif i_offs = 0; /* load "big fat" into memory */ @@ -475,7 +475,7 @@ ole_init(void) count++; } while (sector >= 0); - ole_fat2_ct = (count * sector_sz) / sizeof(gbint32); + ole_fat2_ct = (count * sector_sz) / sizeof(int32_t); if (ole_fat2_ct > 0) { le_read32_buff(&ole_fat2[0], ole_fat2_ct); } @@ -620,14 +620,14 @@ msroute_read_journey(void) len = *cin++; wpt->shortname = cet_str_uni_to_utf8((const short*)cin, len); cin += (len * 2); /* seek over wide string */ - cin += (5 * sizeof(gbint32)); /* five unknown DWORDs */ + cin += (5 * sizeof(int32_t)); /* five unknown DWORDs */ /* offs 12 !!!! Latitude int32 LE */ /* offs 16 !!!! Longitude int32 LE */ wpt->latitude = GPS_Math_Semi_To_Deg(le_read32(cin+12)); wpt->longitude = GPS_Math_Semi_To_Deg(le_read32(cin+16)); - cin += (23 * sizeof(gbint32)); + cin += (23 * sizeof(int32_t)); cin += 3; #ifdef OLE_DEBUG diff --git a/gpsbabel/naviguide.cc b/gpsbabel/naviguide.cc index 3f28f9973..91735c2ec 100644 --- a/gpsbabel/naviguide.cc +++ b/gpsbabel/naviguide.cc @@ -37,7 +37,7 @@ /* Naviguide file header */ typedef struct { - gbuint16 nof_wp; /* Little endean format */ + uint16_t nof_wp; /* Little endean format */ unsigned char pad1[6]; /* 0xff, 0xff, 0x01, 0x00, 0x06, 0x00 */ char signature[9]; /* cWaypoint */ unsigned char pad2[4]; /* 0x01, 0x00, 0x00, 0x00 */ @@ -47,16 +47,16 @@ typedef struct { typedef struct { unsigned char pad1[8]; /* 0xfe, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00 */ /* coordination are in old israeli grid */ - gbint32 East; - gbint32 North; + int32_t East; + int32_t North; unsigned char pad2[2]; /* 0x01, 0x01 */ - gbuint32 Alt; + uint32_t Alt; char CommentLength; } ng_wp_data_t; typedef struct { unsigned char pad1[2]; /* 0x01, 0x80 */ - gbuint16 next_wp; + uint16_t next_wp; unsigned char pad2[2]; /* 0x00, 0x00 */ } ng_next_wp_t; @@ -70,7 +70,7 @@ typedef struct { /* Global variables */ static gbfile* file_in, *file_out; -static gbuint16 nof_wp; +static uint16_t nof_wp; static route_head* rte_head; static ng_file_header_t ng_file_header; static ng_wp_no_comment_t WPNC; @@ -252,8 +252,8 @@ ng_waypt_rd(const waypoint* wpt) fatal(MYNAME ": Waypoint %d is out of the israeli grid area", current_wp_ix); } - WPNC.wp_data.North = (gbint32)lat; - WPNC.wp_data.East = (gbint32)lon; + WPNC.wp_data.North = (int32_t)lat; + WPNC.wp_data.East = (int32_t)lon; if (reorder_wp) { sprintf(temp_short_name, "A%03d", current_wp_ix); diff --git a/gpsbabel/palmdoc.cc b/gpsbabel/palmdoc.cc index 5023dadd9..12eb40aff 100644 --- a/gpsbabel/palmdoc.cc +++ b/gpsbabel/palmdoc.cc @@ -90,13 +90,13 @@ arglist_t palmdoc_args[] = { static struct buffer buf; struct doc_record0 { /* 16 bytes total */ - gbuint16 version; /* 1 = plain text, 2 = compressed */ - gbuint16 reserved1; - gbuint32 doc_size; /* in bytes, when uncompressed */ - gbuint16 num_records; /* PDB header numRecords - 1 */ - gbuint16 rec_size; /* usually RECORD_SIZE_MAX */ - gbuint32 reserved2; - gbuint16 recsizes[1]; + uint16_t version; /* 1 = plain text, 2 = compressed */ + uint16_t reserved1; + uint32_t doc_size; /* in bytes, when uncompressed */ + uint16_t num_records; /* PDB header numRecords - 1 */ + uint16_t rec_size; /* usually RECORD_SIZE_MAX */ + uint32_t reserved2; + uint16_t recsizes[1]; }; static struct recordsize { @@ -112,7 +112,7 @@ static struct bookmark { struct bookmark_record { char text[16]; - gbuint32 offset; + uint32_t offset; }; static void put_byte(struct buffer *b, unsigned char c, int *space) diff --git a/gpsbabel/pdbfile.cc b/gpsbabel/pdbfile.cc index 657758360..abbeae7e4 100644 --- a/gpsbabel/pdbfile.cc +++ b/gpsbabel/pdbfile.cc @@ -50,7 +50,7 @@ pdb_invalid_file(const pdbfile *pdb_in, const char *fmt, ...) /* try to read to EOF (avoid determining file-size) */ static void * -pdb_read_tail(gbfile *fin, gbint32 *size) +pdb_read_tail(gbfile *fin, int32_t *size) { int count; char buff[256]; @@ -84,9 +84,9 @@ pdb_read_tail(gbfile *fin, gbint32 *size) static void pdb_load_data(pdbfile *fin) { - gbuint16 i, ct; + uint16_t i, ct; pdbrec_t *last_rec; - gbuint32 offs; + uint32_t offs; pdbrec_t *rec; /* load the header */ @@ -138,18 +138,18 @@ pdb_load_data(pdbfile *fin) (void) gbfgetuint32(fin->file); /* type */ rec->id = gbfgetint16(fin->file); rec->offs = gbfgetuint32(fin->file); - if ((gbint32)rec->offs < 0) { + if ((int32_t)rec->offs < 0) { pdb_invalid_file(fin, "Invalid offset to record (%0d, id = %d)", rec->offs, rec->id); } } else { - gbuint32 x; + uint32_t x; rec->offs = gbfgetint32(fin->file); x = gbfgetuint32(fin->file); rec->id = x & 0x0ffff; rec->category = (x >> 24) & 0x0f; rec->flags = (x >> 24) & 0xf0; - if ((gbint32)rec->offs < 0) { + if ((int32_t)rec->offs < 0) { pdb_invalid_file(fin, "Invalid offset to resource record (%0d, id = %d)", rec->offs, rec->id); } } @@ -166,7 +166,7 @@ pdb_load_data(pdbfile *fin) last_rec = fin->rec_list; if (fin->appinfo_offs != 0) { - gbuint32 top; + uint32_t top; /* seek to application info offset */ while (offs < fin->appinfo_offs) { @@ -189,7 +189,7 @@ pdb_load_data(pdbfile *fin) fin->appinfo_len = gbfread(fin->appinfo, 1, top - offs, fin->file); offs += fin->appinfo_len; } else { - gbint32 size; + int32_t size; fin->appinfo = pdb_read_tail(fin->file, &size); fin->appinfo_len = size; offs += size; @@ -203,7 +203,7 @@ pdb_load_data(pdbfile *fin) offs++; } if (rec->next) { - rec->size = (gbint32)rec->next->offs - (gbint32)offs; + rec->size = (int32_t)rec->next->offs - (int32_t)offs; if (rec->size > 0) { rec->data = (char*) xmalloc(rec->size); rec->size = gbfread(rec->data, 1, rec->size, fin->file); @@ -234,7 +234,7 @@ pdb_open(const char *filename, const char *module) } int -pdb_read_rec_by_id(pdbfile *fin, const gbuint32 rec_id, gbuint8 *flags, gbuint8 *category, void **data) +pdb_read_rec_by_id(pdbfile *fin, const uint32_t rec_id, uint8_t *flags, uint8_t *category, void **data) { pdbrec_t *rec; @@ -269,7 +269,7 @@ pdb_create(const char *filename, const char *module) } void -pdb_write_rec(pdbfile *fout, const gbuint8 flags, const gbuint8 category, const gbuint32 rec_id, const void *data, const gbuint32 size) +pdb_write_rec(pdbfile *fout, const uint8_t flags, const uint8_t category, const uint32_t rec_id, const void *data, const uint32_t size) { pdbrec_t *rec, *cur; @@ -378,7 +378,7 @@ pdb_flush(pdbfile *file) gbfputuint16(file->rec_ct, fout); for (rec = file->rec_list; rec; rec = rec->next) { - gbuint32 attr; + uint32_t attr; gbfputint32(rec->offs, fout); attr = (rec->category & 0x0f) | (rec->flags & 0xf0); @@ -444,7 +444,7 @@ pdb_eof(pdbfile *fin) } int -pdb_read_rec(pdbfile *fin, gbuint8 *flags, gbuint8 *category, gbuint32 *rec_id, void **data) +pdb_read_rec(pdbfile *fin, uint8_t *flags, uint8_t *category, uint32_t *rec_id, void **data) { if (pdb_eof(fin)) { return -1; diff --git a/gpsbabel/pdbfile.h b/gpsbabel/pdbfile.h index 3a08e9885..3b7b280fe 100644 --- a/gpsbabel/pdbfile.h +++ b/gpsbabel/pdbfile.h @@ -39,11 +39,11 @@ #define EPOCH_1904 2082844800L typedef struct pdbrec_s { - gbuint32 offs; - gbint32 size; - gbuint32 id; - gbuint8 category; - gbuint8 flags; + uint32_t offs; + int32_t size; + uint32_t id; + uint8_t category; + uint8_t flags; char* data; struct pdbrec_s* next; } pdbrec_t; @@ -52,18 +52,18 @@ typedef struct { gbfile* file; char mode; /* file-mode: 1 = read / 2 = write */ char name[PDB_DBNAMELEN + 1]; /* database name */ - gbuint16 attr; /* attributes */ - gbuint16 version; /* version */ + uint16_t attr; /* attributes */ + uint16_t version; /* version */ time_t ctime; /* creation time */ time_t mtime; /* modification time */ time_t btime; /* backup time */ - gbuint32 revision; - gbint32 appinfo_offs; /* offset to application info */ - gbint32 index_offs; /* offset to sort-index info */ - gbuint32 creator; - gbuint32 type; - gbuint32 uid; - gbuint16 rec_ct; + uint32_t revision; + int32_t appinfo_offs; /* offset to application info */ + int32_t index_offs; /* offset to sort-index info */ + uint32_t creator; + uint32_t type; + uint32_t uid; + uint16_t rec_ct; struct pdbrec_s* rec_list; struct pdbrec_s* rec_curr; void* appinfo; @@ -76,9 +76,9 @@ pdbfile* pdb_create(const char* filename, const char* module); void pdb_close(pdbfile* file); int pdb_eof(pdbfile* fin); void pdb_rewind(pdbfile* fin); -int pdb_read_rec(pdbfile* fin, gbuint8* flags, gbuint8* category, gbuint32* rec_id, void** data); -int pdb_read_rec_by_id(pdbfile* fin, const gbuint32 rec_id, gbuint8* flags, gbuint8* category, void** data); -void pdb_write_rec(pdbfile* fout, const gbuint8 flags, const gbuint8 category, const gbuint32 rec_id, const void* data, const gbuint32 size); +int pdb_read_rec(pdbfile* fin, uint8_t* flags, uint8_t* category, uint32_t* rec_id, void** data); +int pdb_read_rec_by_id(pdbfile* fin, const uint32_t rec_id, uint8_t* flags, uint8_t* category, void** data); +void pdb_write_rec(pdbfile* fout, const uint8_t flags, const uint8_t category, const uint32_t rec_id, const void* data, const uint32_t size); #endif #endif diff --git a/gpsbabel/pocketfms_bc.cc b/gpsbabel/pocketfms_bc.cc index 306d473b5..7d46ea542 100644 --- a/gpsbabel/pocketfms_bc.cc +++ b/gpsbabel/pocketfms_bc.cc @@ -28,8 +28,8 @@ static char header_id[] = "BRC"; typedef struct breadcrumb { // header char id[4]; // 0x42 0x52 0x43 0x00 <=> "BRC" - gbuint16 version; // 0x0100 - gbuint16 reserve1; // 0x0000 + uint16_t version; // 0x0100 + uint16_t reserve1; // 0x0000 // data float latitude; float longitude; @@ -41,14 +41,14 @@ typedef struct breadcrumb { float ehpe; // estimated horizontal position error float evpe; // estimated vertical position error float espe; // estimated speed position error - gbuint16 fix; // 1..none, 2..2D, 3..3D, 4..dgps, 5pps - gbuint16 year; // 1999..2999 - gbuint16 month; // 1..12 - gbuint16 day; // 0..31 - gbuint16 hour; // 0.23 - gbuint16 minute; // 0..59 - gbuint16 second; // 0..59 - gbuint16 reserve2; // 0x0000 + uint16_t fix; // 1..none, 2..2D, 3..3D, 4..dgps, 5pps + uint16_t year; // 1999..2999 + uint16_t month; // 1..12 + uint16_t day; // 0..31 + uint16_t hour; // 0.23 + uint16_t minute; // 0..59 + uint16_t second; // 0..59 + uint16_t reserve2; // 0x0000 } BREADCRUMB; static gbfile *file_in, *file_out; diff --git a/gpsbabel/psp.cc b/gpsbabel/psp.cc index 2008ab798..eca8321e0 100644 --- a/gpsbabel/psp.cc +++ b/gpsbabel/psp.cc @@ -69,7 +69,7 @@ static char * psp_read_str(gbfile *fin) { int len; - gbint16 *buff; + int16_t *buff; char *res; len = (unsigned char)gbfgetc(fin); @@ -77,7 +77,7 @@ psp_read_str(gbfile *fin) return NULL; } - buff = (gbint16*) xmalloc(len * sizeof(*buff)); + buff = (int16_t*) xmalloc(len * sizeof(*buff)); gbfread(buff, sizeof(*buff), len, fin); res = cet_str_uni_to_utf8(buff, len); xfree(buff); diff --git a/gpsbabel/quovadis.cc b/gpsbabel/quovadis.cc index 7c1908186..7e286129c 100644 --- a/gpsbabel/quovadis.cc +++ b/gpsbabel/quovadis.cc @@ -24,8 +24,8 @@ #if PDBFMTS_ENABLED static pdbfile *file_in, *file_out; -static gbuint8* rec_ptr = NULL; -static gbuint8* current_rec = NULL; +static uint8_t* rec_ptr = NULL; +static uint8_t* current_rec = NULL; static int rec_index = 0; static int ct; static char *dbname = NULL; @@ -149,11 +149,11 @@ quovadis_writewpt(waypoint *wpt) int i; if (current_rec == NULL) { - gbuint8 dummy = 0; + uint8_t dummy = 0; pdb_write_rec(file_out, 0, 0, ct++, &dummy, 1); - current_rec = (gbuint8 *) xcalloc(MAXCHUNKSIZE, 1); + current_rec = (uint8_t *) xcalloc(MAXCHUNKSIZE, 1); rec_index = 0; rec_ptr = current_rec; } diff --git a/gpsbabel/saroute.cc b/gpsbabel/saroute.cc index 3b01f4571..c6bcc24b4 100644 --- a/gpsbabel/saroute.cc +++ b/gpsbabel/saroute.cc @@ -118,25 +118,25 @@ static void my_read(void) { - gbuint16 version; - gbuint32 count; - gbuint32 outercount; - gbuint32 recsize; - gbuint16 stringlen; + uint16_t version; + uint32_t count; + uint32_t outercount; + uint32_t recsize; + uint16_t stringlen; unsigned char *record; static int serial = 0; struct ll { - gbint32 lat; - gbint32 lon; + int32_t lat; + int32_t lon; } *latlon; - gbuint16 coordcount; + uint16_t coordcount; route_head *track_head = NULL; route_head *old_track_head = NULL; waypoint *wpt_tmp; char *routename = NULL; double seglen = 0.0; - gbint32 starttime = 0; - gbint32 transittime = 0; + int32_t starttime = 0; + int32_t transittime = 0; double totaldist = 0.0; double oldlat = 0; double oldlon = 0; @@ -163,7 +163,7 @@ my_read(void) */ record = ReadRecord(infile, recsize); - stringlen = le_read16((gbuint16 *)(record + 0x1a)); + stringlen = le_read16((uint16_t *)(record + 0x1a)); if (stringlen) { routename = (char *)xmalloc(stringlen + 1); routename[stringlen] = '\0'; @@ -305,7 +305,7 @@ my_read(void) ReadShort(infile); recsize = ReadLong(infile); record = ReadRecord(infile, recsize); - stringlen = le_read16((gbuint16 *)record); + stringlen = le_read16((uint16_t *)record); if (split && stringlen) { if (track_head->rte_waypt_ct) { old_track_head = track_head; @@ -328,14 +328,14 @@ my_read(void) if (timesynth) { seglen = le_read_double( record + 2 + stringlen + 0x08); - starttime = le_read32((gbuint32 *) + starttime = le_read32((uint32_t *) (record + 2 + stringlen + 0x30)); - transittime = le_read32((gbuint32 *) + transittime = le_read32((uint32_t *) (record + 2 + stringlen + 0x10)); seglen /= 5280*12*2.54/100000; /* to miles */ } - coordcount = le_read16((gbuint16 *) + coordcount = le_read16((uint16_t *) (record + 2 + stringlen + 0x3c)); latlon = (struct ll *)(record + 2 + stringlen + 0x3c + 2); count--; @@ -422,7 +422,7 @@ my_read(void) first = 0; } if (version > 10) { - Skip(infile,2*sizeof(gbuint32)); + Skip(infile,2*sizeof(uint32_t)); } xfree(record); } diff --git a/gpsbabel/skytraq.cc b/gpsbabel/skytraq.cc index f9ed3e480..dcd7242c2 100644 --- a/gpsbabel/skytraq.cc +++ b/gpsbabel/skytraq.cc @@ -165,7 +165,7 @@ rd_char(int *errors) } static int -rd_buf(const gbuint8 *buf, int len) +rd_buf(const uint8_t *buf, int len) { int rc, timeout, i; char dump[16*3+16+2]; @@ -212,7 +212,7 @@ static unsigned int rd_word(void) { int errors = 5; /* allow this many errors */ - gbuint8 buffer[2]; + uint8_t buffer[2]; buffer[0] = rd_char(&errors); buffer[1] = rd_char(&errors); @@ -247,9 +247,9 @@ wr_buf(const unsigned char *str, int len) * %%% SkyTraq protocol implementation %%% * *******************************************************************************/ -gbuint8 NL[2] = { 0x0D, 0x0A }; -gbuint8 MSG_START[2] = { 0xA0, 0xA1 }; -gbuint8 SECTOR_READ_END[13] = { 'E','N','D', 0, 'C','H','E','C','K','S','U','M','=' }; +uint8_t NL[2] = { 0x0D, 0x0A }; +uint8_t MSG_START[2] = { 0xA0, 0xA1 }; +uint8_t SECTOR_READ_END[13] = { 'E','N','D', 0, 'C','H','E','C','K','S','U','M','=' }; static int skytraq_calc_checksum(const unsigned char *buf, int len) @@ -315,7 +315,7 @@ skytraq_rd_msg(const void *payload, unsigned int len) } static void -skytraq_wr_msg(const gbuint8 *payload, int len) +skytraq_wr_msg(const uint8_t *payload, int len) { int cs; @@ -332,9 +332,9 @@ skytraq_wr_msg(const gbuint8 *payload, int len) } static int -skytraq_expect_ack(gbuint8 id) +skytraq_expect_ack(uint8_t id) { - gbuint8 ack_msg[2]; + uint8_t ack_msg[2]; int i/*, rcv_len*/; for (i = 0; i < MSG_RETRIES; i++) { @@ -371,7 +371,7 @@ skytraq_expect_ack(gbuint8 id) } static int -skytraq_expect_msg(gbuint8 id, const gbuint8 *payload, int len) +skytraq_expect_msg(uint8_t id, const uint8_t *payload, int len) { int i, rc; @@ -389,7 +389,7 @@ skytraq_expect_msg(gbuint8 id, const gbuint8 *payload, int len) } static int -skytraq_wr_msg_verify(const gbuint8 *payload, int len) +skytraq_wr_msg_verify(const uint8_t *payload, int len) { int i, rc; @@ -412,7 +412,7 @@ skytraq_wr_msg_verify(const gbuint8 *payload, int len) static int skytraq_system_restart(void) { - gbuint8 MSG_SYSTEM_RESTART[15] = + uint8_t MSG_SYSTEM_RESTART[15] = { 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; db(2, "restart system\n"); @@ -425,7 +425,7 @@ skytraq_set_baud(int baud) /* Note: according to AN0003_v3.pdf, attrib == 0x00 means write to SRAM only, however * it seems to write to flash too. The Windows software sends 0x02 so we do here too. */ - gbuint8 MSG_CONFIGURE_SERIAL_PORT[4] + uint8_t MSG_CONFIGURE_SERIAL_PORT[4] = { 0x05, 0x00, 0x00, 0x02 }; int rc; @@ -481,7 +481,7 @@ skytraq_configure_logging(void) // an0008-1.4.14: logs if // (dt > tmin & dd >= dmin & v >= vmin) | dt > tmax | dd > dmax | v > vmax unsigned int tmin=6, tmax=3600, dmin=0, dmax=10000, nn=0; - gbuint8 MSG_LOG_CONFIGURE_CONTROL[] = { + uint8_t MSG_LOG_CONFIGURE_CONTROL[] = { 0x18, // message_id 0x00, 0x00, 0x0e, 0x10, // max_time: was 0x0000ffff (big endian!) 0x00, 0x00, 0x00, 0x06, // min_time: was 0x00000005 @@ -513,16 +513,16 @@ skytraq_configure_logging(void) } static int -skytraq_get_log_buffer_status(gbuint32 *log_wr_ptr, gbuint16 *sectors_free, gbuint16 *sectors_total) +skytraq_get_log_buffer_status(uint32_t *log_wr_ptr, uint16_t *sectors_free, uint16_t *sectors_total) { - gbuint8 MSG_LOG_STATUS_CONTROL = 0x17; + uint8_t MSG_LOG_STATUS_CONTROL = 0x17; struct { - gbuint8 id[1]; - gbuint8 log_wr_ptr[4]; - gbuint8 sectors_free[2]; - gbuint8 sectors_total[2]; - gbuint8 max_time[4], min_time[4], max_dist[4], min_dist[4], max_speed[4], min_speed[4]; - gbuint8 datalog_enable[1], log_fifo_mode[1]; + uint8_t id[1]; + uint8_t log_wr_ptr[4]; + uint8_t sectors_free[2]; + uint8_t sectors_total[2]; + uint8_t max_time[4], min_time[4], max_dist[4], min_dist[4], max_speed[4], min_speed[4]; + uint8_t datalog_enable[1], log_fifo_mode[1]; } MSG_LOG_STATUS_OUTPUT; unsigned int rc; @@ -531,7 +531,7 @@ skytraq_get_log_buffer_status(gbuint32 *log_wr_ptr, gbuint16 *sectors_free, gbui return res_ERROR; } - rc = skytraq_expect_msg(0x94, (gbuint8*)&MSG_LOG_STATUS_OUTPUT, sizeof(MSG_LOG_STATUS_OUTPUT)); + rc = skytraq_expect_msg(0x94, (uint8_t*)&MSG_LOG_STATUS_OUTPUT, sizeof(MSG_LOG_STATUS_OUTPUT)); if (rc < sizeof(MSG_LOG_STATUS_OUTPUT)) { db(1, MYNAME ": Didn't receive expected reply (%d)\n", rc); return res_ERROR; @@ -669,18 +669,18 @@ make_trackpoint(struct read_state *st, double lat, double lon, double alt) } typedef struct { - gbuint32 gps_week; - gbuint32 gps_sec; - gbint32 x; - gbint32 y; - gbint32 z; + uint32_t gps_week; + uint32_t gps_sec; + int32_t x; + int32_t y; + int32_t z; } full_item; typedef struct { - gbuint16 dt; - gbint16 dx; - gbint16 dy; - gbint16 dz; + uint16_t dt; + int16_t dx; + int16_t dy; + int16_t dz; } compact_item; struct full_item_frame { @@ -807,7 +807,7 @@ process_data_item(struct read_state *pst, const item_frame *pitem, int len) } static int /* returns number of bytes processed (terminates on 0xFF i.e. empty or padding bytes) */ -process_data_sector(struct read_state *pst, const gbuint8 *buf, int len) +process_data_sector(struct read_state *pst, const uint8_t *buf, int len) { int plen, ilen; @@ -824,12 +824,12 @@ process_data_sector(struct read_state *pst, const gbuint8 *buf, int len) /* Note: the buffer is being padded with 0xFFs if necessary so there are always SECTOR_SIZE valid bytes */ static int -skytraq_read_single_sector(unsigned int sector, gbuint8 *buf) +skytraq_read_single_sector(unsigned int sector, uint8_t *buf) { - gbuint8 MSG_LOG_SECTOR_READ_CONTROL[2] = { 0x1B, (gbuint8)(sector) }; + uint8_t MSG_LOG_SECTOR_READ_CONTROL[2] = { 0x1B, (uint8_t)(sector) }; int errors = 5; /* allow this many errors */ unsigned int c, i, j, cs; - gbuint8 buffer[16]; + uint8_t buffer[16]; if (sector > 0xFF) { fatal(MYNAME ": Invalid sector number (%i)\n", sector); @@ -837,7 +837,7 @@ skytraq_read_single_sector(unsigned int sector, gbuint8 *buf) db(2, "Reading sector #%i...\n", sector); - if (skytraq_wr_msg_verify((gbuint8*)&MSG_LOG_SECTOR_READ_CONTROL, sizeof(MSG_LOG_SECTOR_READ_CONTROL)) != res_OK) { + if (skytraq_wr_msg_verify((uint8_t*)&MSG_LOG_SECTOR_READ_CONTROL, sizeof(MSG_LOG_SECTOR_READ_CONTROL)) != res_OK) { db(1, MYNAME ": Didn't receive ACK\n"); return res_ERROR; } @@ -915,10 +915,10 @@ skytraq_read_single_sector(unsigned int sector, gbuint8 *buf) } static int -skytraq_read_multiple_sectors(int first_sector, unsigned int sector_count, gbuint8 *buf) +skytraq_read_multiple_sectors(int first_sector, unsigned int sector_count, uint8_t *buf) { - gbuint8 MSG_LOG_READ_MULTI_SECTORS[5] = { 0x1D }; - gbuint8 *buf_end_tag; + uint8_t MSG_LOG_READ_MULTI_SECTORS[5] = { 0x1D }; + uint8_t *buf_end_tag; unsigned int cs, i, read_result; if (first_sector < 0 || first_sector > 0xFFFF) { @@ -932,7 +932,7 @@ skytraq_read_multiple_sectors(int first_sector, unsigned int sector_count, gbuin db(2, "Reading %i sectors beginning from #%i...\n", sector_count, first_sector); - read_result = skytraq_wr_msg_verify((gbuint8*)&MSG_LOG_READ_MULTI_SECTORS, sizeof(MSG_LOG_READ_MULTI_SECTORS)); + read_result = skytraq_wr_msg_verify((uint8_t*)&MSG_LOG_READ_MULTI_SECTORS, sizeof(MSG_LOG_READ_MULTI_SECTORS)); if (read_result != res_OK) { return read_result; } @@ -967,14 +967,14 @@ static void skytraq_read_tracks(void) { struct read_state st; - gbuint32 log_wr_ptr; - gbuint16 sectors_free, sectors_total, /*sectors_used_a, sectors_used_b,*/ sectors_used; + uint32_t log_wr_ptr; + uint16_t sectors_free, sectors_total, /*sectors_used_a, sectors_used_b,*/ sectors_used; int i, t, s, rc, got_sectors, total_sectors_read = 0; int read_at_once = MAX(atoi(opt_read_at_once), 1); int opt_first_sector_val = atoi(opt_first_sector); int opt_last_sector_val = atoi(opt_last_sector); int multi_read_supported = 1; - gbuint8 *buffer = NULL; + uint8_t *buffer = NULL; gbfile *dumpfile = NULL; state_init(&st); @@ -1014,7 +1014,7 @@ skytraq_read_tracks(void) } } - buffer = (gbuint8*) xmalloc(SECTOR_SIZE*read_at_once+sizeof(SECTOR_READ_END)+6); + buffer = (uint8_t*) xmalloc(SECTOR_SIZE*read_at_once+sizeof(SECTOR_READ_END)+6); // m.ad/090930: removed code that tried reducing read_at_once if necessary since doesn't work with xmalloc if (opt_dump_file) { @@ -1100,13 +1100,13 @@ skytraq_probe(void) int baud_rates[] = { 9600, 230400, 115200, 57600, 4800, 19200, 38400 }; int baud_rates_count = sizeof(baud_rates)/sizeof(baud_rates[0]); int initbaud = atoi(opt_initbaud); - gbuint8 MSG_QUERY_SOFTWARE_VERSION[2] = { 0x02, 0x01 }; + uint8_t MSG_QUERY_SOFTWARE_VERSION[2] = { 0x02, 0x01 }; struct { - gbuint8 id; - gbuint8 sw_type; - gbuint8 kernel_ver[4]; - gbuint8 odm_ver[4]; - gbuint8 revision[4]; + uint8_t id; + uint8_t sw_type; + uint8_t kernel_ver[4]; + uint8_t odm_ver[4]; + uint8_t revision[4]; } MSG_SOFTWARE_VERSION; int i, rc; @@ -1149,7 +1149,7 @@ skytraq_probe(void) { continue; }*/ - rc = skytraq_expect_msg(0x80, (gbuint8*)&MSG_SOFTWARE_VERSION, sizeof(MSG_SOFTWARE_VERSION)); + rc = skytraq_expect_msg(0x80, (uint8_t*)&MSG_SOFTWARE_VERSION, sizeof(MSG_SOFTWARE_VERSION)); if (rc < (int)sizeof(MSG_SOFTWARE_VERSION)) { db(2, "Didn't receive expected reply (%d)\n", rc); } else { @@ -1172,7 +1172,7 @@ skytraq_probe(void) static int skytraq_erase() { - gbuint8 MSG_LOG_ERASE = 0x19; + uint8_t MSG_LOG_ERASE = 0x19; db(1, MYNAME ": Erasing logger memory...\n"); if (skytraq_wr_msg_verify(&MSG_LOG_ERASE, sizeof(MSG_LOG_ERASE)) != res_OK) { @@ -1188,8 +1188,8 @@ skytraq_set_location(void) { double lat, lng; unsigned int i; - gbuint8 MSG_SET_LOCATION[17] = { 0x36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - gbuint8 MSG_GET_LOCATION = 0x35; + uint8_t MSG_SET_LOCATION[17] = { 0x36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + uint8_t MSG_GET_LOCATION = 0x35; db(3, MYNAME ": set_location='%s'\n", opt_set_location); @@ -1200,7 +1200,7 @@ skytraq_set_location(void) db(3, "%02x ", MSG_SET_LOCATION[i]); } db(3, "\n"); - if (skytraq_wr_msg_verify((gbuint8*)&MSG_SET_LOCATION, sizeof(MSG_SET_LOCATION)) != res_OK) { + if (skytraq_wr_msg_verify((uint8_t*)&MSG_SET_LOCATION, sizeof(MSG_SET_LOCATION)) != res_OK) { fatal(MYNAME ": cannot set new location\n"); } { @@ -1294,10 +1294,10 @@ file_read(void) int opt_first_sector_val = atoi(opt_first_sector); int opt_last_sector_val = atoi(opt_last_sector); int sectors_read; - gbuint8 *buffer; + uint8_t *buffer; state_init(&st); - buffer = (gbuint8*) xmalloc(SECTOR_SIZE); + buffer = (uint8_t*) xmalloc(SECTOR_SIZE); if (opt_first_sector_val > 0) { db(4, MYNAME ": Seeking to first-sector index %i\n", opt_first_sector_val*SECTOR_SIZE); @@ -1436,8 +1436,8 @@ void lla2ecef(double lat, double lng, double alt, double *ecef_x, double *ecef_y } static void miniHomer_get_poi() { - gbuint8 MSG_GET_POI[3] = { 0x4D, 0, 0}; - gbuint8 buf[32]; + uint8_t MSG_GET_POI[3] = { 0x4D, 0, 0}; + uint8_t buf[32]; unsigned int poi; double lat, lng, alt; double ecef_x, ecef_y, ecef_z; @@ -1446,7 +1446,7 @@ static void miniHomer_get_poi() for (poi=0; poi>8)&0xff; MSG_GET_POI[2]=(poi)&0xff; - if (skytraq_wr_msg_verify((gbuint8*)&MSG_GET_POI, sizeof(MSG_GET_POI)) != res_OK) { + if (skytraq_wr_msg_verify((uint8_t*)&MSG_GET_POI, sizeof(MSG_GET_POI)) != res_OK) { warning(MYNAME ": cannot read poi %d '%s'\n", poi, poinames[poi]); } skytraq_rd_msg(buf, 25); @@ -1479,10 +1479,10 @@ static void miniHomer_get_poi() * -1 in case of errors * the number of the POI will not be checked - if it is not correct, miniHome will send NACK */ -static int miniHomer_set_poi(gbuint16 poinum, const char *opt_poi) +static int miniHomer_set_poi(uint16_t poinum, const char *opt_poi) { -#define MSG_SET_POI_SIZE (sizeof(gbuint8)+sizeof(gbuint16)+3*sizeof(double)+sizeof(gbuint8)) - gbuint8 MSG_SET_POI[MSG_SET_POI_SIZE] = { +#define MSG_SET_POI_SIZE (sizeof(uint8_t)+sizeof(uint16_t)+3*sizeof(double)+sizeof(uint8_t)) + uint8_t MSG_SET_POI[MSG_SET_POI_SIZE] = { 0x4C, 0, 0, // cmd + poi (u16) 0, 0, 0, 0, 0, 0, 0, 0, //lat (double ecef) 0, 0, 0, 0, 0, 0, 0, 0, //lng (double ecef) @@ -1512,7 +1512,7 @@ static int miniHomer_set_poi(gbuint16 poinum, const char *opt_poi) be_write_double(MSG_SET_POI+11, ecef_y); be_write_double(MSG_SET_POI+19, ecef_z); MSG_SET_POI[27]=0; - if (skytraq_wr_msg_verify((gbuint8*)&MSG_SET_POI, sizeof(MSG_SET_POI)) == res_OK) { + if (skytraq_wr_msg_verify((uint8_t*)&MSG_SET_POI, sizeof(MSG_SET_POI)) == res_OK) { result=1; } else { warning(MYNAME ": cannot set poi %d '%s'\n", poinum, poinames[poinum]); diff --git a/gpsbabel/teletype.cc b/gpsbabel/teletype.cc index 2026da71b..3ff3133b0 100644 --- a/gpsbabel/teletype.cc +++ b/gpsbabel/teletype.cc @@ -34,7 +34,7 @@ arglist_t teletype_args[] = { * %%% global callbacks called by gpsbabel main process %%% * *******************************************************************************/ -static gbuint32 tty_wpt_count; +static uint32_t tty_wpt_count; static gbfile* fin; static void @@ -57,15 +57,15 @@ teletype_rd_deinit(void) static void teletype_read(void) { - gbuint32 i; + uint32_t i; for (i = 0; i < tty_wpt_count; i++) { waypoint* wpt = waypt_new(); wpt->shortname = (gbfgetcstr(fin)); wpt->description = (gbfgetcstr(fin)); if (1) { // needs bit values of NEWFORMAT2 - gbuint32 direction = gbfgetuint32(fin); - gbuint32 mins = gbfgetuint32(fin); + uint32_t direction = gbfgetuint32(fin); + uint32_t mins = gbfgetuint32(fin); (void) direction ; (void) mins ; } diff --git a/gpsbabel/text.cc b/gpsbabel/text.cc index a71baa38c..28d47d47b 100644 --- a/gpsbabel/text.cc +++ b/gpsbabel/text.cc @@ -98,7 +98,7 @@ text_disp(const waypoint *wpt) int latint, lonint; char tbuf[1024]; time_t tm = wpt->GetCreationTime(); - gbint32 utmz; + int32_t utmz; double utme, utmn; char utmzc; char *tmpout1, *tmpout2; diff --git a/gpsbabel/unicsv.cc b/gpsbabel/unicsv.cc index dcb4487d4..ce2b4e9d4 100644 --- a/gpsbabel/unicsv.cc +++ b/gpsbabel/unicsv.cc @@ -131,7 +131,7 @@ typedef enum { typedef struct { const char *name; field_e type; - gbuint32 options; + uint32_t options; } field_t; /* diff --git a/gpsbabel/util.cc b/gpsbabel/util.cc index 52cd22c7e..b89108391 100644 --- a/gpsbabel/util.cc +++ b/gpsbabel/util.cc @@ -1892,7 +1892,7 @@ const char *get_filename(const char *fname) /* * setbit: Set bit number [nr] of buffer [buf] */ -void gb_setbit(void *buf, const gbuint32 nr) +void gb_setbit(void *buf, const uint32_t nr) { unsigned char *bytes = (unsigned char *) buf; bytes[nr / 8] |= (1 << (nr % 8)); @@ -1901,7 +1901,7 @@ void gb_setbit(void *buf, const gbuint32 nr) /* * setbit: Get state of bit number [nr] of buffer [buf] */ -char gb_getbit(const void *buf, const gbuint32 nr) +char gb_getbit(const void *buf, const uint32_t nr) { const unsigned char *bytes = (const unsigned char *) buf; return (bytes[nr / 8] & (1 << (nr % 8))); diff --git a/gpsbabel/vitosmt.cc b/gpsbabel/vitosmt.cc index fe4ea9557..ba890d9a2 100644 --- a/gpsbabel/vitosmt.cc +++ b/gpsbabel/vitosmt.cc @@ -343,17 +343,17 @@ vitosmt_write(void) /* write the complete the header */ le_write32(&workbuffer[position],vitosmt_version); - position += sizeof(gbuint32); + position += sizeof(uint32_t); le_write32(&workbuffer[position],vitosmt_subversion); - position += sizeof(gbuint32); + position += sizeof(uint32_t); le_write32(&workbuffer[position],count); - position += sizeof(gbuint32); + position += sizeof(uint32_t); le_write32(&workbuffer[position],0); - position += sizeof(gbuint32); + position += sizeof(uint32_t); le_write32(&workbuffer[position],count-1); - position += sizeof(gbuint32); + position += sizeof(uint32_t); le_write32(&workbuffer[position],count); - position += sizeof(gbuint32); + position += sizeof(uint32_t); gbfrewind(ofs); (void)gbfwrite(workbuffer,vitosmt_headersize,1,ofs); diff --git a/gpsbabel/vpl.cc b/gpsbabel/vpl.cc index c1be36f80..b25c13644 100644 --- a/gpsbabel/vpl.cc +++ b/gpsbabel/vpl.cc @@ -169,11 +169,11 @@ vpl_wr_init(const char *fname) void vpl_parse_75_sentence(const char *ibuf) { - gbuint32 ymd, hms; - gbint32 lat_raw, lon_raw; - gbint16 alt, speed_raw; - gbuint16 hdg_raw; - gbuint8 sats, hdop_raw, vdop_raw; + uint32_t ymd, hms; + int32_t lat_raw, lon_raw; + int16_t alt, speed_raw; + uint16_t hdg_raw; + uint8_t sats, hdop_raw, vdop_raw; waypoint *waypt; struct tm tm; diff --git a/gpsbabel/wbt-200.cc b/gpsbabel/wbt-200.cc index cd393da19..896c88c64 100644 --- a/gpsbabel/wbt-200.cc +++ b/gpsbabel/wbt-200.cc @@ -513,7 +513,7 @@ static double get_param_float(const char *cmd) int mon = (((tim) >> 22) & 0x0F); \ int year = (((tim) >> 26) & 0x3F); -static time_t decode_date(gbuint32 tim) +static time_t decode_date(uint32_t tim) { _SPLIT_DATE(tim) struct tm t; @@ -528,7 +528,7 @@ static time_t decode_date(gbuint32 tim) return mkgmtime(&t); } -static int check_date(gbuint32 tim) +static int check_date(uint32_t tim) { _SPLIT_DATE(tim) @@ -568,7 +568,7 @@ static waypoint *make_trackpoint(struct read_state *st, double lat, double lon, static int wbt200_data_chunk(struct read_state *st, const void *buf, int fmt) { - gbuint32 tim; + uint32_t tim; double lat, lon, alt; time_t rtim; waypoint *tpt = NULL; @@ -577,8 +577,8 @@ static int wbt200_data_chunk(struct read_state *st, const void *buf, int fmt) tim = le_read32(bp + 0); - lat = (double)((gbint32) le_read32(bp + 4)) / 10000000; - lon = (double)((gbint32) le_read32(bp + 8)) / 10000000; + lat = (double)((int32_t) le_read32(bp + 4)) / 10000000; + lon = (double)((int32_t) le_read32(bp + 8)) / 10000000; /* Handle extra fields in longer records here. */ if (buf_used >= 16) { @@ -625,7 +625,7 @@ static int is_valid(struct buf_head *h, int fmt) for (;;) { size_t got = buf_read(h, buf, reclen); - gbuint32 tim; + uint32_t tim; /* Don't mind odd bytes at the end - we may * be examining an incomplete dataset. */ @@ -640,7 +640,7 @@ static int is_valid(struct buf_head *h, int fmt) if (reclen > 12) { #ifdef MAXALT - gbuint32 alt = le_read32(buf + 12); + uint32_t alt = le_read32(buf + 12); if (alt > MAXALT * 10) { return 0; } @@ -804,8 +804,8 @@ static int all_null(const void *buf, const int len) static int wbt201_data_chunk(struct read_state *st, const void *buf) { - gbuint32 tim; - gbuint16 flags; + uint32_t tim; + uint16_t flags; double lat, lon, alt; time_t rtim; waypoint *tpt = NULL; @@ -824,9 +824,9 @@ static int wbt201_data_chunk(struct read_state *st, const void *buf) return 0; } - lat = (double)((gbint32) le_read32(bp + 6)) / 10000000; - lon = (double)((gbint32) le_read32(bp + 10)) / 10000000; - alt = (double)((gbint16) le_read16(bp + 14)); + lat = (double)((int32_t) le_read32(bp + 6)) / 10000000; + lon = (double)((int32_t) le_read32(bp + 10)) / 10000000; + alt = (double)((int16_t) le_read16(bp + 14)); rtim = decode_date(tim); diff --git a/gpsbabel/wintec_tes.cc b/gpsbabel/wintec_tes.cc index 1f1870b27..99715b76e 100644 --- a/gpsbabel/wintec_tes.cc +++ b/gpsbabel/wintec_tes.cc @@ -39,7 +39,7 @@ wintec_tes_rd_deinit(void) } static time_t -wintec_date_to_time(gbuint32 w) +wintec_date_to_time(uint32_t w) { struct tm tm; memset(&tm, 0, sizeof(tm)); @@ -61,11 +61,11 @@ wintec_tes_read(void) while (!gbfeof(fin)) { waypoint *wpt; - gbuint16 flags = gbfgetuint16(fin); - gbuint32 date = gbfgetuint32(fin); - gbint32 latitude = gbfgetint32(fin); - gbint32 longitude = gbfgetint32(fin); - gbint16 alt = gbfgetint16(fin); // Signed. Meters. + uint16_t flags = gbfgetuint16(fin); + uint32_t date = gbfgetuint32(fin); + int32_t latitude = gbfgetint32(fin); + int32_t longitude = gbfgetint32(fin); + int16_t alt = gbfgetint16(fin); // Signed. Meters. (void) flags; // Silence 'unused' warning until we use flags. wpt = waypt_new(); -- 2.30.2